OSDN Git Service
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
TreeHugger Robot [Mon, 12 Jun 2017 11:47:11 +0000 (11:47 +0000)]
Merge "Update restricted list prefrences before dialog creation."
Bill Yi [Sat, 10 Jun 2017 06:17:33 +0000 (06:17 +0000)]
Import translations. DO NOT MERGE am:
5a3748e39a -s ours
am:
7fb248e126 -s ours
Change-Id: Ic098c9d9fabb9529da9e51c007aeea2129dd211a
Bill Yi [Sat, 10 Jun 2017 06:09:16 +0000 (06:09 +0000)]
Import translations. DO NOT MERGE
am:
5a3748e39a -s ours
Change-Id: Ie76608b1e36973b34eb896cbf5871fa9b658fc39
Bill Yi [Sat, 10 Jun 2017 01:36:51 +0000 (18:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cf44e9a52a89c9d4ebdfa3e05897e68e6ea505f
Auto-generated-cl: translation import
Andrew Sapperstein [Fri, 9 Jun 2017 23:16:33 +0000 (23:16 +0000)]
Update SummaryPreference to use config_headlineFontFamily. am:
be3972d7c2
am:
3c8b5fa905
Change-Id: I5de459efc257a13d17ffe520c783f5cf9582563e
Andrew Sapperstein [Fri, 9 Jun 2017 22:50:29 +0000 (22:50 +0000)]
Update SummaryPreference to use config_headlineFontFamily.
am:
be3972d7c2
Change-Id: I794adde11115dbcbcdc07f3307c284253a4a33b0
Andrew Sapperstein [Fri, 9 Jun 2017 00:27:14 +0000 (17:27 -0700)]
Update SummaryPreference to use config_headlineFontFamily.
Also deleted a couple of unused files.
Change-Id: I42b6f6c79c3a7ba00040d657204830c5a468a2b2
Fixes:
62385826
Test: manual
Daniel Nishi [Fri, 9 Jun 2017 18:20:19 +0000 (18:20 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev am:
1dc3f38506
am:
d60511d6ca
Change-Id: Ic688f627e055fca2e461d394625c1ade1a6ca06c
Daniel Nishi [Fri, 9 Jun 2017 18:07:15 +0000 (18:07 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
am:
1dc3f38506
Change-Id: If51ce88bc44c123080c3853152f026fc3c2d23ea
Daniel Nishi [Fri, 9 Jun 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Add "Free up space" to the Settings search." into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 17:20:16 +0000 (17:20 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev am:
bacb9fc459
am:
a61192df26
Change-Id: Id9dca7989dafd788d1fb46ca7b28ca9c3f08072e
Maurice Lam [Fri, 9 Jun 2017 17:17:16 +0000 (17:17 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev
am:
bacb9fc459
Change-Id: I5d9d673d07d84cb630a04e620c8818f187350cc0
Maurice Lam [Fri, 9 Jun 2017 17:07:47 +0000 (17:07 +0000)]
Merge "Create new category for lock screen redaction" into oc-dr1-dev
Maurice Lam [Fri, 9 Jun 2017 16:57:49 +0000 (16:57 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev am:
128fd39a13
am:
73f137c74c
Change-Id: Ide45ba2f36327e2b864a6f58d288c70b89140ed2
Maurice Lam [Fri, 9 Jun 2017 16:55:29 +0000 (16:55 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev
am:
128fd39a13
Change-Id: I50ef5d7f0a403389339b041c6064bfc188a7d4cd
Maurice Lam [Fri, 9 Jun 2017 16:50:55 +0000 (16:50 +0000)]
Merge "Add intent action to support page" into oc-dr1-dev
Andrew Sapperstein [Fri, 9 Jun 2017 16:35:43 +0000 (16:35 +0000)]
Refactor test runner to use static list of resource paths am:
9f1e911759
am:
d745ed5972
Change-Id: I445876e61890633ed05761ee21e1efa66c956307
Andrew Sapperstein [Fri, 9 Jun 2017 16:33:43 +0000 (16:33 +0000)]
Refactor test runner to use static list of resource paths
am:
9f1e911759
Change-Id: I5d00898c2c3f335f543fcbd31f2b977e67ad1abd
Andrew Sapperstein [Fri, 9 Jun 2017 02:27:36 +0000 (19:27 -0700)]
Refactor test runner to use static list of resource paths
Previously everything lived in an inner class method of
SettingsRobolectricTestRunner. That method has now been turned into
a static method so that it can be called by other runners.
Bug:
62460102
Test: robotests
Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840
Antony Sargent [Fri, 9 Jun 2017 16:06:46 +0000 (16:06 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60 am:
92661526d4
am:
827ce8bc90
Change-Id: I9e69ee5b898820fc21b87b5a6faf858b14f85b1c
Antony Sargent [Fri, 9 Jun 2017 16:06:09 +0000 (16:06 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60 am:
6a5f36a494
am:
e20b2ea043
Change-Id: I0c081383954104ab3d22439dffb3a6aefd6efe3a
Antony Sargent [Fri, 9 Jun 2017 15:57:25 +0000 (15:57 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60
am:
92661526d4
Change-Id: I915fc0691158c2b7a7c4adccc038f79fad8ccfd8
Antony Sargent [Fri, 9 Jun 2017 15:54:38 +0000 (15:54 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev am:
d77b699e60
am:
6a5f36a494
Change-Id: I011faf9c0b0ea10ab9c23caa2daa0e5b74915900
Antony Sargent [Fri, 9 Jun 2017 15:49:11 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec
Antony Sargent [Fri, 9 Jun 2017 15:49:10 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13
Antony Sargent [Fri, 9 Jun 2017 15:41:25 +0000 (15:41 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 09:02:42 +0000 (09:02 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev am:
5d02b8b85f
am:
e880102a80
Change-Id: I5e72b91b1eb291a35bf31a65a87a4c9a186dd432
Hugo Benichi [Fri, 9 Jun 2017 09:00:11 +0000 (09:00 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
am:
5d02b8b85f
Change-Id: I0c3429fa16cf6b69c401f33ddc51f161eed02dff
Hugo Benichi [Fri, 9 Jun 2017 08:56:17 +0000 (08:56 +0000)]
Merge "Instrument sign-in-captive-portal button" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 08:40:10 +0000 (08:40 +0000)]
Merge "Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8 am:
3aae1f336e -s ours" into oc-dr1-dev-plus-aosp
am:
5f86be6cce -s ours
Change-Id: I463463084d959b1e3e9c20a429686040d050c72e
jackqdyulei [Fri, 9 Jun 2017 08:39:43 +0000 (08:39 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8 -s ours am:
8a241a438b -s ours
am:
abdac61f08 -s ours
Change-Id: I631fbde26ad1547d8cece3611f0eaea207f9cf40
Android Build Merger (Role) [Fri, 9 Jun 2017 08:37:40 +0000 (08:37 +0000)]
Merge "Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8 am:
3aae1f336e -s ours" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 9 Jun 2017 08:37:15 +0000 (08:37 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8 -s ours
am:
8a241a438b -s ours
Change-Id: Ia7fd253450ff8224724b1ed15f689fe4dc9b4d1d
jackqdyulei [Fri, 9 Jun 2017 08:37:15 +0000 (08:37 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am:
4f02eebab8
am:
3aae1f336e -s ours
Change-Id: I1f2a83c9f65231c4b6c3d119a3cf67507b10f3b5
jackqdyulei [Fri, 9 Jun 2017 08:34:46 +0000 (08:34 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am:
4f02eebab8
Change-Id: Id02583309a3e547855b7ffc69e065c2293fb172e
jackqdyulei [Fri, 9 Jun 2017 08:34:43 +0000 (08:34 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am:
4f02eebab8 -s ours
Change-Id: I19ee339c025e3db0c26cd323b65db1131980733e
TreeHugger Robot [Fri, 9 Jun 2017 08:29:56 +0000 (08:29 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
jackqdyulei [Fri, 9 Jun 2017 04:57:22 +0000 (04:57 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev am:
4c4e780577
am:
3f3e44114e
Change-Id: I2494d08a3a40a23c5f71eacde8733d98dc0510ac
jackqdyulei [Thu, 8 Jun 2017 21:26:39 +0000 (14:26 -0700)]
Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings
Handle it in onCreate() and onSaveInstanceState()
Bug:
62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Merged-In: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
jackqdyulei [Fri, 9 Jun 2017 04:47:21 +0000 (04:47 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev
am:
4c4e780577
Change-Id: I12b32cd315a7bc17b1b92b2e9c1b43bafe62f0e9
TreeHugger Robot [Fri, 9 Jun 2017 04:39:39 +0000 (04:39 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dr1-dev
jackqdyulei [Fri, 9 Jun 2017 03:04:00 +0000 (03:04 +0000)]
Merge "Merge "Update subtitle for apps in battery settings" into oc-dev am:
031b90541f am:
6525053801" into oc-dr1-dev-plus-aosp
am:
8fcd16a93f
Change-Id: If549bb552df5b50f2ee69ade4b616a1e0cc17e33
Fan Zhang [Fri, 9 Jun 2017 03:03:14 +0000 (03:03 +0000)]
Merge "Merge "Use support feature provider to provide intro url." into oc-dr1-dev am:
bdc0816982" into oc-dr1-dev-plus-aosp
am:
afa34b1cc4
Change-Id: Iac1d851fb89ea51827bca764004ff3741f54dd14
jackqdyulei [Fri, 9 Jun 2017 03:02:45 +0000 (03:02 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev am:
031b90541f am:
424edd3064
am:
b0490baa77
Change-Id: I07e2f7c98bdd73703d6c8b153491cbf5bc9d01f6
Android Build Merger (Role) [Fri, 9 Jun 2017 03:01:06 +0000 (03:01 +0000)]
Merge "Merge "Update subtitle for apps in battery settings" into oc-dev am:
031b90541f am:
6525053801" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 9 Jun 2017 03:00:53 +0000 (03:00 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev am:
031b90541f
am:
6525053801
Change-Id: Iac6dc5501c3acc1d3229b5637c513f87e99583d8
Android Build Merger (Role) [Fri, 9 Jun 2017 03:00:44 +0000 (03:00 +0000)]
Merge "Merge "Use support feature provider to provide intro url." into oc-dr1-dev am:
bdc0816982" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev am:
031b90541f
am:
424edd3064
Change-Id: I36aba85cd1deb78fef15092996e6cc1b364dd79f
Fan Zhang [Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)]
Merge "Use support feature provider to provide intro url." into oc-dr1-dev
am:
bdc0816982
Change-Id: I3e174e5e85641fa995f218c23dabfd97d39bfefe
jackqdyulei [Fri, 9 Jun 2017 02:57:46 +0000 (02:57 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
am:
031b90541f
Change-Id: I7ec1ee37eb42d5523502ae3a17694f61ea6197ba
jackqdyulei [Fri, 9 Jun 2017 02:57:46 +0000 (02:57 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
am:
031b90541f
Change-Id: Ia0581b295824b73ef36f931066b883cff51fc0e9
TreeHugger Robot [Fri, 9 Jun 2017 02:54:31 +0000 (02:54 +0000)]
Merge "Use support feature provider to provide intro url." into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 02:53:35 +0000 (02:53 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
Hugo Benichi [Mon, 5 Jun 2017 07:30:37 +0000 (16:30 +0900)]
Instrument sign-in-captive-portal button
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: WifiDetailPreferenceControllerTest updated
Change-Id: I03dbcdd6efbd0d7aaf2ef67d541fceeb6acc2acf
(cherry picked from commit
539211a718125cc894b81ccbb9e5d1f9364912b5)
Hugo Benichi [Fri, 9 Jun 2017 02:42:24 +0000 (02:42 +0000)]
Merge "Instrument sign-in-captive-portal button"
jackqdyulei [Thu, 8 Jun 2017 21:26:39 +0000 (14:26 -0700)]
Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings
Handle it in onCreate() and onSaveInstanceState()
Bug:
62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Matthew Fritze [Fri, 9 Jun 2017 01:29:15 +0000 (01:29 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33 am:
d07e14fb5b
am:
e844588e0e
Change-Id: I25ec3fe7798ec88fa91028914e11ee519ef74662
Matthew Fritze [Fri, 9 Jun 2017 01:28:48 +0000 (01:28 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33 am:
824f25320a
am:
0514c19273
Change-Id: Ia9baa982a544d126bd175c0112f240aa73412857
Matthew Fritze [Fri, 9 Jun 2017 01:26:29 +0000 (01:26 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33
am:
d07e14fb5b
Change-Id: Ib7114a07a0bf7b2a6fdf3129f641846b46e9b777
Matthew Fritze [Fri, 9 Jun 2017 01:25:38 +0000 (01:25 +0000)]
Merge "Search results always highlight proper results" into oc-dev am:
2a32cb6a33
am:
824f25320a
Change-Id: I11bf6fe5cfc5acb63cee7c8b4e35e2b518c7604b
Matthew Fritze [Fri, 9 Jun 2017 01:23:39 +0000 (01:23 +0000)]
Merge "Search results always highlight proper results" into oc-dev
am:
2a32cb6a33
Change-Id: I649a4122952a41b31ee66b0daab8607b683d3e19
Matthew Fritze [Fri, 9 Jun 2017 01:23:39 +0000 (01:23 +0000)]
Merge "Search results always highlight proper results" into oc-dev
am:
2a32cb6a33
Change-Id: I1bc6297cc75aa833184a00598f5930aa3ca114dc
TreeHugger Robot [Fri, 9 Jun 2017 01:19:37 +0000 (01:19 +0000)]
Merge "Search results always highlight proper results" into oc-dev
Doris Ling [Fri, 9 Jun 2017 01:15:38 +0000 (01:15 +0000)]
Merge "Update text for Languages & Input." into oc-dr1-dev am:
73e03e6ca2
am:
94fa9d8f6e
Change-Id: I7ae8afa33248302f55126cbc6d4f0e89a7f41eee
Doris Ling [Fri, 9 Jun 2017 01:13:36 +0000 (01:13 +0000)]
Merge "Update text for Languages & Input." into oc-dr1-dev
am:
73e03e6ca2
Change-Id: I339b129e599c11136add30af66514d783ee94554
TreeHugger Robot [Fri, 9 Jun 2017 01:10:46 +0000 (01:10 +0000)]
Merge "Increase visibilities in SearchFragment and SearchResutlsAdapter for testing"
TreeHugger Robot [Fri, 9 Jun 2017 01:09:24 +0000 (01:09 +0000)]
Merge "Update text for Languages & Input." into oc-dr1-dev
Maurice Lam [Thu, 8 Jun 2017 18:57:40 +0000 (11:57 -0700)]
Add intent action to support page
Test: cd tests/robotests && mma
Bug:
62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
(cherry picked from commit
1bf5454f64572d9dd58897e5c4981d9a91ce98e0)
TreeHugger Robot [Fri, 9 Jun 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Add intent action to support page"
Daniel Nishi [Fri, 9 Jun 2017 00:30:31 +0000 (00:30 +0000)]
Merge "Merge "Update the music files icon." into oc-dev am:
47c6afde7f am:
60287a50e8" into oc-dr1-dev-plus-aosp
am:
feaa8fe083
Change-Id: Ifdf5877774b4022a118fa9231aaee1fe6f4a3579
Daniel Nishi [Fri, 9 Jun 2017 00:30:02 +0000 (00:30 +0000)]
Merge "Update the music files icon." into oc-dev am:
47c6afde7f am:
f928324747
am:
b50e0063e2
Change-Id: I090bf8bc49e06259f70da79ffc0f345dd0bbd883
Android Build Merger (Role) [Fri, 9 Jun 2017 00:20:57 +0000 (00:20 +0000)]
Merge "Merge "Update the music files icon." into oc-dev am:
47c6afde7f am:
60287a50e8" into oc-dr1-dev-plus-aosp
Daniel Nishi [Fri, 9 Jun 2017 00:20:34 +0000 (00:20 +0000)]
Merge "Update the music files icon." into oc-dev am:
47c6afde7f
am:
60287a50e8
Change-Id: I6a51ed255964fb115e1be9e288cc9d71afe0b969
Daniel Nishi [Fri, 9 Jun 2017 00:20:31 +0000 (00:20 +0000)]
Merge "Update the music files icon." into oc-dev am:
47c6afde7f
am:
f928324747
Change-Id: I3726c2842bf3957564c5def187e268a0316c3cc4
Maurice Lam [Thu, 8 Jun 2017 03:59:51 +0000 (20:59 -0700)]
Create new category for lock screen redaction
So that we can show it without all the other default setup wizard
only actions.
Test: Manual
Bug:
62278041
Change-Id: Iba8a626b9b6e1ae909b4f6260dae7c0462b92627
(cherry picked from commit
96ae3f82b3645904e97851b97a276745f458b70e)
Daniel Nishi [Fri, 9 Jun 2017 00:19:04 +0000 (00:19 +0000)]
Merge "Update the music files icon." into oc-dev
am:
47c6afde7f
Change-Id: I20505a1958f7639ac91c571371a7555c4f9b9024
Daniel Nishi [Fri, 9 Jun 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Update the music files icon." into oc-dev
am:
47c6afde7f
Change-Id: I78e6e1a16e25aff0e0374f5910fcbba0624f712b
TreeHugger Robot [Fri, 9 Jun 2017 00:15:25 +0000 (00:15 +0000)]
Merge "Create new category for lock screen redaction"
TreeHugger Robot [Fri, 9 Jun 2017 00:13:18 +0000 (00:13 +0000)]
Merge "Update the music files icon." into oc-dev
Alex Kulesza [Thu, 8 Jun 2017 23:44:49 +0000 (23:44 +0000)]
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev am:
bf9cb113c1
am:
68be1736d3
Change-Id: Ie29e3ccc04512b1b999a94c1bc8867f5a4cbadf6
Fan Zhang [Thu, 8 Jun 2017 22:50:18 +0000 (15:50 -0700)]
Use support feature provider to provide intro url.
Change-Id: I3d2493ec8c84fdc61c04fd63537f959fbd589e98
Fix:
62034077
Test: make RunSettingsRoboTests
Alex Kulesza [Thu, 8 Jun 2017 23:28:28 +0000 (23:28 +0000)]
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
am:
bf9cb113c1
Change-Id: I7dc6abaa4f9033492e848aa0977349e375991ec1
Matthew Fritze [Wed, 7 Jun 2017 00:14:33 +0000 (17:14 -0700)]
Search results always highlight proper results
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.
This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.
Instead, we calculate index right before we highlight.
Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes:
62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
TreeHugger Robot [Thu, 8 Jun 2017 23:23:00 +0000 (23:23 +0000)]
Merge "Implement general projection curve support for UsageGraph." into oc-dr1-dev
Daniel Nishi [Mon, 5 Jun 2017 22:28:48 +0000 (15:28 -0700)]
Add "Free up space" to the Settings search.
Change-Id: I8e987595adbd3c32de4001527a2a20478686d3e7
Fixes:
62167072
Test: Manual
Bill Yi [Thu, 8 Jun 2017 23:01:23 +0000 (23:01 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours am:
52c0cd702c -s ours
am:
94e485819c -s ours
Change-Id: I0eb4dfe4e6ea190053a142f94a9c0fc93619124e
Bill Yi [Thu, 8 Jun 2017 23:00:31 +0000 (23:00 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours am:
7134ca433b -s ours
am:
a372e3c40e -s ours
Change-Id: I8283273a50b4d45c7716101d07aa5c0e0a645963
Bill Yi [Thu, 8 Jun 2017 22:55:00 +0000 (22:55 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours
am:
52c0cd702c -s ours
Change-Id: I9b2a91a8a00da16ed51f3a2c36c8f7bc5eebe990
Bill Yi [Thu, 8 Jun 2017 22:53:09 +0000 (22:53 +0000)]
Import translations. DO NOT MERGE am:
29a7bce4e5 -s ours
am:
7134ca433b -s ours
Change-Id: Ieacc318862dce2ea16bcf451fd24a1f2a47b8a27
Bill Yi [Thu, 8 Jun 2017 22:48:47 +0000 (22:48 +0000)]
Import translations. DO NOT MERGE
am:
29a7bce4e5 -s ours
Change-Id: Iaec93787ba7a7e2eb885893842cea02932e16abe
Bill Yi [Thu, 8 Jun 2017 22:46:57 +0000 (22:46 +0000)]
Import translations. DO NOT MERGE
am:
29a7bce4e5 -s ours
Change-Id: I436ea7a7e5a758581ed5b4e0c6aa0bc3773d702c
jackqdyulei [Wed, 7 Jun 2017 22:56:03 +0000 (15:56 -0700)]
Update subtitle for apps in battery settings
1. If it is a normal app, show "Screen usage TIME"
2. If it is a hidden app, show "TIME"
Note that in this case the item screen will show "TIME"
Bug:
62422404
Test: RunSettingsRoboTests
Change-Id: Ie8d6caf998d18994ac158f0217109c0e5e9f92ba
Soroosh Mariooryad [Fri, 2 Jun 2017 00:10:53 +0000 (17:10 -0700)]
Increase visibilities in SearchFragment and SearchResutlsAdapter for testing
Test: RunSettingsRoboTests
Bug:
36867802
Change-Id: I9102d02a5500330ce53e742ecd2084f0e714b830
Maurice Lam [Thu, 8 Jun 2017 18:57:40 +0000 (11:57 -0700)]
Add intent action to support page
Test: cd tests/robotests && mma
Bug:
62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
Doris Ling [Wed, 7 Jun 2017 21:16:43 +0000 (14:16 -0700)]
Update text for Languages & Input.
- update preference title to include gesture
- if assist gesture is supported, set summary text to reflect assist
status
Change-Id: I79477f331ae447d2505a1519da09886bf07ba1a2
Fix:
62219660
Test: make RunSettingsRoboTests
Lei Yu [Thu, 8 Jun 2017 18:08:03 +0000 (18:08 +0000)]
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev am:
377907ebad
am:
d16769a168
Change-Id: I209de5071a31c0c0da8a1822914b7ed3d3fbf41e
Lei Yu [Thu, 8 Jun 2017 18:05:05 +0000 (18:05 +0000)]
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev
am:
377907ebad
Change-Id: Ib201d8b7358c05017d8c22ad9a50233599ee123e
Lei Yu [Thu, 8 Jun 2017 17:59:33 +0000 (17:59 +0000)]
Merge "Add debug data in AnomalyLoader" into oc-dr1-dev
Daniel Nishi [Mon, 5 Jun 2017 21:35:29 +0000 (14:35 -0700)]
Update the music files icon.
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes:
62291640
Test: Manual
OSDN Git Service
