Skip to content

Commit 06b6b69

Browse files
committed
refactor: cleanup
1 parent c33db7b commit 06b6b69

7 files changed

Lines changed: 13 additions & 36 deletions

File tree

JankStatsSample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Benchmark Sample
1+
JankStats Sample
22
===================================
33

44
This sample project shows how to use the JankStats library.

JankStatsSample/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ android {
2323
buildTypes {
2424
release {
2525
minifyEnabled false
26-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
26+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
2727
}
2828
}
2929
compileOptions {

JankStatsSample/app/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
This file was deleted.

JankStatsSample/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:supportsRtl="true"
1111
android:theme="@style/Theme.JankStats">
1212
<activity
13-
android:name=".MainActivity"
13+
android:name=".JankLoggingActivity"
1414
android:exported="true">
1515
<intent-filter>
1616
<action android:name="android.intent.action.MAIN" />

JankStatsSample/app/src/main/java/com/example/jankstats/JankAggregatorActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.navigation.fragment.NavHostFragment
2525
import androidx.navigation.ui.AppBarConfiguration
2626
import androidx.navigation.ui.navigateUp
2727
import androidx.navigation.ui.setupActionBarWithNavController
28-
import com.example.jankstats.databinding.ActivityMainBinding
28+
import com.example.jankstats.databinding.ActivityJankLoggingBinding
2929
import kotlinx.coroutines.Dispatchers
3030
import kotlinx.coroutines.asExecutor
3131

@@ -38,7 +38,7 @@ import kotlinx.coroutines.asExecutor
3838
*/
3939
class JankAggregatorActivity : AppCompatActivity() {
4040

41-
private lateinit var binding: ActivityMainBinding
41+
private lateinit var binding: ActivityJankLoggingBinding
4242
private lateinit var navController: NavController
4343
private lateinit var appBarConfiguration: AppBarConfiguration
4444

@@ -59,7 +59,7 @@ class JankAggregatorActivity : AppCompatActivity() {
5959

6060
override fun onCreate(savedInstanceState: Bundle?) {
6161
super.onCreate(savedInstanceState)
62-
binding = ActivityMainBinding.inflate(layoutInflater)
62+
binding = ActivityJankLoggingBinding.inflate(layoutInflater)
6363
setContentView(binding.root)
6464
setupUi()
6565

@@ -84,7 +84,7 @@ class JankAggregatorActivity : AppCompatActivity() {
8484
jankStatsAggregator.issueJankReport("Activity paused")
8585
jankStatsAggregator.jankStats.isTrackingEnabled = false
8686
}
87-
87+
8888
override fun onSupportNavigateUp(): Boolean {
8989
return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
9090
}

JankStatsSample/app/src/main/java/com/example/jankstats/MainActivity.kt renamed to JankStatsSample/app/src/main/java/com/example/jankstats/JankLoggingActivity.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import androidx.navigation.fragment.NavHostFragment
2626
import androidx.navigation.ui.AppBarConfiguration
2727
import androidx.navigation.ui.navigateUp
2828
import androidx.navigation.ui.setupActionBarWithNavController
29-
import com.example.jankstats.databinding.ActivityMainBinding
29+
import com.example.jankstats.databinding.ActivityJankLoggingBinding
3030
import kotlinx.coroutines.Dispatchers
3131
import kotlinx.coroutines.asExecutor
3232

@@ -36,19 +36,17 @@ import kotlinx.coroutines.asExecutor
3636
* callbacks with jank data.
3737
*/
3838
// [START activity_init]
39-
class MainActivity : AppCompatActivity() {
39+
class JankLoggingActivity : AppCompatActivity() {
4040

4141
private lateinit var jankStats: JankStats
42+
4243
// [START_EXCLUDE]
43-
private lateinit var binding: ActivityMainBinding
44+
private lateinit var binding: ActivityJankLoggingBinding
4445
private lateinit var navController: NavController
4546
private lateinit var appBarConfiguration: AppBarConfiguration
4647

4748
// [START jank_frame_listener]
4849
private val jankFrameListener = JankStats.OnFrameListener { frameData ->
49-
// you can process only janky frames if needed
50-
if (frameData.isJank) return@OnFrameListener
51-
5250
Log.v("JankStatsSample", frameData.toString())
5351
}
5452
// [END jank_frame_listener]
@@ -57,7 +55,7 @@ class MainActivity : AppCompatActivity() {
5755
override fun onCreate(savedInstanceState: Bundle?) {
5856
super.onCreate(savedInstanceState)
5957
// [START_EXCLUDE]
60-
binding = ActivityMainBinding.inflate(layoutInflater)
58+
binding = ActivityJankLoggingBinding.inflate(layoutInflater)
6159
setContentView(binding.root)
6260
setupUi()
6361
// [END_EXCLUDE]

JankStatsSample/app/src/main/res/layout/activity_main.xml renamed to JankStatsSample/app/src/main/res/layout/activity_jank_logging.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
xmlns:tools="http://schemas.android.com/tools"
2020
android:layout_width="match_parent"
2121
android:layout_height="match_parent"
22-
tools:context=".MainActivity">
22+
tools:context=".JankLoggingActivity">
2323

2424
<com.google.android.material.appbar.AppBarLayout
2525
android:layout_width="match_parent"

0 commit comments

Comments
 (0)