Ricky Wai
e4b811fe6a
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev am: 2f99770
...
am: a62dd8b
* commit 'a62dd8b1d116ca0f17a33551480f8173e1ff9b31':
Hint user that fingerprint cannot unlock FBE keys
Change-Id: I1fbf61bd752ace0b52b3de4e8f9f5945a6b3aa21
2016-04-12 11:20:54 +00:00
Daniel U
a62dd8b1d1
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
...
am: 2f99770
* commit '2f99770cc178011de27813398364da20283fce47':
Hint user that fingerprint cannot unlock FBE keys
Change-Id: I74e902c396a54b0bee8886c93eaeb30abdde54c9
2016-04-12 11:15:24 +00:00
Ricky Wai
2f99770cc1
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
2016-04-12 11:06:25 +00:00
Nathan Harold
6322fa7e0c
Cleanup RadioInfo Test Menu am: 2b77d74
...
am: 262b404
* commit '262b404cf9d6c3360439ec2a1b9a153db8ac4a16':
Cleanup RadioInfo Test Menu
Change-Id: I343d6654b9a1b923d383d34a4aca6773012e4700
2016-04-12 01:19:23 +00:00
Nathan Harold
262b404cf9
Cleanup RadioInfo Test Menu
...
am: 2b77d74
* commit '2b77d7460ccebd97826529f186596df14050f0ae':
Cleanup RadioInfo Test Menu
Change-Id: I63f6638893e60e0eef75396d3bee0d8bf223cff1
2016-04-12 01:14:23 +00:00
Nathan Harold
2b77d7460c
Cleanup RadioInfo Test Menu
...
-Convert multi-mode buttons to toggle switches to reduce
confusion.
-Remove long-deprecated PhoneStateIntentReceiver references
and convert all functions to use PhoneStateListener
-Remove vestigial menu items that no longer reference working
system properties or code
-Add new ARFCN/UARFCN/EARFCN fields to CellInfo Display
-Convert CellInfoListRate to a Dropdown menu
-Fixed bugs with screen rotation that caused network preferences
to change (and could crash the radio)
-Fixed bugs related to onResume not updating values correctly
-Re-ordered menu items to group like-items together
-Minor string edits for clarity, correctness, and consistency
Change-Id: Ied5ed7a250682ee3327e51884d80ee4f3a7eb913
2016-04-11 15:31:59 -07:00
Fan Zhang
3213165773
Merge changes from topic 'revert_noe_status'
...
* changes:
Revert "Add suggestion carousel view and dependencies to settings"
Remove DashboardStatusFragment and hide sliding tab layout.
Revert "Add a RecyclerView adapter for first tab in settings."
Revert "Dashboard status cards UI."
2016-04-11 20:45:16 +00:00
Jason Monk
7d49252421
Merge "Fix battery history details" into nyc-dev am: 43fa74b
...
am: 9eeb3f3
* commit '9eeb3f3d2d7892ca540ae6dc9567d1816dcf0613':
Fix battery history details
Change-Id: I3c3bf2755ca8d7e2cca0cbf3277d1d515c8c072e
2016-04-11 19:11:46 +00:00
Jason Monk
9eeb3f3d2d
Merge "Fix battery history details" into nyc-dev
...
am: 43fa74b
* commit '43fa74b9fdaf8398d0c1498311b307fbfea135a0':
Fix battery history details
Change-Id: I57cc3e650cb9b1d0ff0d786dc6e27179d27107bb
2016-04-11 19:06:55 +00:00
Jason Monk
43fa74b9fd
Merge "Fix battery history details" into nyc-dev
2016-04-11 18:58:25 +00:00
Jason Monk
0b026116be
Fix battery history details
...
Change-Id: Ibf73d28d227574cba0866accdf7c9dc810b24906
Fixes: 27844566
2016-04-11 14:55:34 -04:00
Alan Viverette
7140b17bdb
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev am: 6a0b722
...
am: 50528a4
* commit '50528a4e0011310293343b05781ee4dca0006e09':
Fix EBT helper initialization in LabeledSeekBar class
Change-Id: Iea75763062ef6b439457bfe9de9f507e738babd4
2016-04-11 18:52:26 +00:00
Alan Viverette
50528a4e00
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev
...
am: 6a0b722
* commit '6a0b7229847c6b2afb2a83aa397d23ec36a1df5b':
Fix EBT helper initialization in LabeledSeekBar class
Change-Id: I8e400e00a4a064dc33f575223a29b01165c1b54a
2016-04-11 18:48:44 +00:00
Alan Viverette
6a0b722984
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev
2016-04-11 18:32:22 +00:00
Fyodor Kupolov
dcb30e1dcd
Merge "Added getProfileIds method returning array of userIds" into nyc-dev am: 1ef3164
...
am: 1b8b3fa
* commit '1b8b3fab3ddc71bc1567f8e260d7f0082924e5e5':
Added getProfileIds method returning array of userIds
Change-Id: I5bf3d7d6d19c73518b63f612a7d1b66880db0535
2016-04-11 17:03:16 +00:00
Fan Zhang
4bffbdb928
Revert "Add suggestion carousel view and dependencies to settings"
...
This reverts commit 0050ac0bb7 .
Change-Id: Ic61137bae0fa1a6de5ba4970e8a3a3b4fe0469a3
2016-04-11 09:56:46 -07:00
Fan Zhang
3645373b6f
Remove DashboardStatusFragment and hide sliding tab layout.
...
Bug: 28090184
Change-Id: I34ff46d0f5ba87c824d1484f1018fad154696e15
2016-04-11 09:56:39 -07:00
Fyodor Kupolov
1b8b3fab3d
Merge "Added getProfileIds method returning array of userIds" into nyc-dev
...
am: 1ef3164
* commit '1ef3164424cf6ac7ab604e9cdf0e1a2c67a7ea89':
Added getProfileIds method returning array of userIds
Change-Id: I2f64e0079fc57d4e51fd222b9e8835d202e84448
2016-04-11 16:50:37 +00:00
Fyodor Kupolov
1ef3164424
Merge "Added getProfileIds method returning array of userIds" into nyc-dev
2016-04-11 16:40:54 +00:00
Fan Zhang
872c61249b
Revert "Add a RecyclerView adapter for first tab in settings."
...
This reverts commit 44e7be1289 .
Change-Id: I1391f41a19526ebd02a0c06e628fb1e18d454a71
2016-04-11 09:13:16 -07:00
Fan Zhang
dcb2b500d4
Revert "Dashboard status cards UI."
...
This reverts commit d42e233bf0 .
Change-Id: I58b4bcb2e153da26fb043bff2ce58d2c474b567b
2016-04-11 08:41:22 -07:00
Jason Monk
a26bb71068
Merge "Pull pref summaries from power usage summary" into nyc-dev am: 3cd935c
...
am: 4a0c449
* commit '4a0c449ade858a12f18fb03d14115852067a4403':
Pull pref summaries from power usage summary
Change-Id: I80f9ee746cabf2c3ad9dcfd441fa37d6590963ea
2016-04-11 14:32:32 +00:00
Jason Monk
b7c24099e4
Merge "Guard against crash in SummaryProvider" into nyc-dev am: 3095c77
...
am: 4fbb0e3
* commit '4fbb0e35e8a44b23b4f9a95ccdfb5e094c663f5c':
Guard against crash in SummaryProvider
Change-Id: I8223bac4b7d8cf17f4cd4a47c479c2c2b95160e7
2016-04-11 14:31:39 +00:00
Jason Monk
4a0c449ade
Merge "Pull pref summaries from power usage summary" into nyc-dev
...
am: 3cd935c
* commit '3cd935c89c46cdbbe5556823393045081ef6d844':
Pull pref summaries from power usage summary
Change-Id: Ic512bfb11423a01db290fe941ef8365a53b67d4e
2016-04-11 14:31:38 +00:00
Jason Monk
ce15b1c7ed
Merge "Remove OpenGL traces from dev settings" into nyc-dev am: eeb2a19
...
am: f5f750d
* commit 'f5f750d840933e4244711345cb78b67bcf9c5e61':
Remove OpenGL traces from dev settings
Change-Id: I9971817d3f2052c0c06f4997a4b5a817e70dd864
2016-04-11 14:31:38 +00:00
Jason Monk
3cd935c89c
Merge "Pull pref summaries from power usage summary" into nyc-dev
2016-04-11 14:28:23 +00:00
Jason Monk
4fbb0e35e8
Merge "Guard against crash in SummaryProvider" into nyc-dev
...
am: 3095c77
* commit '3095c77d5b28839ff6e757d6c08afd1bd2cd7afa':
Guard against crash in SummaryProvider
Change-Id: I759042100f3b4f21b9056d83b817634f066fae93
2016-04-11 14:26:50 +00:00
Jason Monk
f5f750d840
Merge "Remove OpenGL traces from dev settings" into nyc-dev
...
am: eeb2a19
* commit 'eeb2a19a50c0fa1792ed163b555d0bddf217080f':
Remove OpenGL traces from dev settings
Change-Id: Ia36a2187188f103da55e1066754ef764cc90c341
2016-04-11 14:26:50 +00:00
Jason Monk
e04517611f
Pull pref summaries from power usage summary
...
Change-Id: I9bd3d1041576e183e7e5e03aaecc5128ea5227c2
Fixes: 27644604
2016-04-11 10:25:04 -04:00
Jason Monk
3095c77d5b
Merge "Guard against crash in SummaryProvider" into nyc-dev
2016-04-11 14:23:37 +00:00
Jason Monk
0127eb07f4
Guard against crash in SummaryProvider
...
Change-Id: Ieeae65e50211618dbbee3d320cae614ac5926543
Fixes: 26310547
2016-04-11 10:21:28 -04:00
Jason Monk
4b32de0d35
Fix localization issues with disabled am: 9e9ba0d
...
am: 22b5064
* commit '22b5064424547daf4cdda5d106aa559539e89c23':
Fix localization issues with disabled
Change-Id: I958dffd6f1c8370d5408b811a804411095a9eb74
2016-04-11 14:20:17 +00:00
Jason Monk
eeb2a19a50
Merge "Remove OpenGL traces from dev settings" into nyc-dev
2016-04-11 14:19:55 +00:00
Jason Monk
4572249f5d
Remove OpenGL traces from dev settings
...
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes: 26741446
2016-04-11 10:17:53 -04:00
Jason Monk
22b5064424
Fix localization issues with disabled
...
am: 9e9ba0d
* commit '9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064':
Fix localization issues with disabled
Change-Id: If37b22b8dd44ad42265227b20c449acc97b06bb4
2016-04-11 14:14:53 +00:00
Jason Monk
9e9ba0d751
Fix localization issues with disabled
...
Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
2016-04-11 09:58:55 -04:00
Jason Monk
19fad2550e
Merge "Settings tweaks"
2016-04-11 13:24:38 +00:00
Jason Monk
c19eb986f3
Settings tweaks
...
Change-Id: I68829fa8e49534d4635a008c94dced3c7ab6f4b1
Fixes: 27834471
Fixes: 27834626
Fixes: 27567838
Fixes: 27834676
2016-04-11 09:21:24 -04:00
Clara Bayarri
99ea9716d5
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev am: 6599660
...
am: 232302e
* commit '232302ef30ea47d19b635ea9839ed83eccb864b1':
Add Keyboard Shortcuts Helper entry in Settings
Change-Id: Iff3367c55d8d92b25328224599cad9e445a6ab48
2016-04-11 10:05:55 +00:00
Clara Bayarri
232302ef30
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
...
am: 6599660
* commit '659966019601b64fecd24a80d549b8d870059435':
Add Keyboard Shortcuts Helper entry in Settings
Change-Id: I99dd51ef8dfdb80a59e003f332988b298e20152c
2016-04-11 09:55:54 +00:00
Clara Bayarri
6599660196
Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev
2016-04-11 09:44:20 +00:00
Yohei Yukawa
efa5468c0e
Shorten title name so as not to hit char limit. am: cf87fd5
...
am: 5eff28a
* commit '5eff28a5cfce5c7c29a367c4a9885514088d8a41':
Shorten title name so as not to hit char limit.
Change-Id: Id00e95153de7464c8fcbf7adae9dd2009d1b1f98
2016-04-10 06:40:36 +00:00
Yohei Yukawa
5eff28a5cf
Shorten title name so as not to hit char limit.
...
am: cf87fd5
* commit 'cf87fd5beda44205a0d87565d2672cf038fbe70e':
Shorten title name so as not to hit char limit.
Change-Id: I849aacf5c30610a8396146b86b65c9ff612ac29d
2016-04-10 06:36:54 +00:00
Yohei Yukawa
cf87fd5bed
Shorten title name so as not to hit char limit.
...
This is a follow up CL to my previous CL [1], which tried to rename a
settings item "Add virtual keyboard" but ended up with hitting char
limit in many languages. We decided to use "Manage keyboards" instead
so as not to hit char limit.
[1]: Id2ae61519152bbe622aa5915f728a4cbbc49e078
611410a8c4
Bug: 27543291
Bug: 27959401
Change-Id: I6e4795f8c4dbe9857d036ca19689e05658aa0640
2016-04-10 06:30:38 +00:00
Suprabh Shukla
2775de111b
Fixed obsolete import
...
Change-Id: Ibee0284c61f3e559efeb9a28788b55e86a8355c6
2016-04-10 02:15:07 +00:00
Bill Yi
81870def82
Import translations. DO NOT MERGE am: 2f26075 -s ours
...
am: 050ead0 -s ours
* commit '050ead07be0f67a49688a07dee5c42302e77e502':
Import translations. DO NOT MERGE
Change-Id: I195bab1a4f01d40fd72b94befa89984550c0b112
2016-04-09 22:44:03 +00:00
Jason Monk
a4be4da636
Merge "Settings tweaks" into nyc-dev am: db3fcfb
...
am: 14b6f12 -s ours
* commit '14b6f12aeaaa00d35feee4e5b19f9b6792874c5f':
Settings tweaks
Change-Id: I8b1c1cdcc17a6722c9aba2cb55956f0444f8b5fe
2016-04-09 22:44:01 +00:00
Bill Yi
050ead07be
Import translations. DO NOT MERGE
...
am: 2f26075 -s ours
* commit '2f260757a2cec3f735d7cc175115cc1f6bee8903':
Import translations. DO NOT MERGE
Change-Id: I99a3400ce2b1583832c46b20454fc97ecfb78870
2016-04-09 14:11:35 +00:00
Bill Yi
91e14b92a9
Merge "Import translations. DO NOT MERGE"
2016-04-09 14:01:50 +00:00
Bill Yi
2f260757a2
Import translations. DO NOT MERGE
...
Change-Id: I89dec6af8243722e59f53b19ea182dc1357e4f47
Auto-generated-cl: translation import
2016-04-09 06:46:45 -07:00