OSDN Git Service
Nathan Harold [Wed, 13 Apr 2016 07:46:34 +0000 (07:46 +0000)]
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev am:
0887ace
am:
69f68de
* commit '
69f68debd59c24857662ffb34178d03742cb6dac':
Minor Fixes for RadioInfo Test Menu
Change-Id: I4307f76190e470c4d57f247de018445d9183a6e8
Nathan Harold [Wed, 13 Apr 2016 07:43:23 +0000 (07:43 +0000)]
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
am:
0887ace
* commit '
0887ace34472469003299d782b90c8fd9324bb7e':
Minor Fixes for RadioInfo Test Menu
Change-Id: Ia7d06a94f81e5f27500bf63a16d95dad6f8d8829
Nathan Harold [Wed, 13 Apr 2016 07:37:37 +0000 (07:37 +0000)]
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
Nathan Harold [Wed, 13 Apr 2016 07:29:30 +0000 (00:29 -0700)]
Minor Fixes for RadioInfo Test Menu
-Fix a race condition in re-creating activity
-Ensure cell info is disabled when Menu is paused
-Fix issue with focus on creating view
Change-Id: Icfb7667fe6e47ab6dc950918447bbe892e0681ad
TreeHugger Robot [Wed, 13 Apr 2016 03:25:20 +0000 (03:25 +0000)]
Merge "Clearing cache for managed profile apps" into nyc-dev am:
490e40e
am:
b8b8fc2
* commit '
b8b8fc2fe5fd33e5f7b6a139c79bfd51e8ec0cd5':
Clearing cache for managed profile apps
Change-Id: I4e6abe0faa6f91deccb8ceca3a38460bf2e61687
Suprabh Shukla [Wed, 13 Apr 2016 03:22:27 +0000 (03:22 +0000)]
Merge "Clearing cache for managed profile apps" into nyc-dev
am:
490e40e
* commit '
490e40ecc842c2d333657951fd45bea358c816a5':
Clearing cache for managed profile apps
Change-Id: Id74948c6b55f9b27f8bdcf0ee3cf0fdee323ca0d
TreeHugger Robot [Wed, 13 Apr 2016 03:13:47 +0000 (03:13 +0000)]
Merge "Clearing cache for managed profile apps" into nyc-dev
Chris Wren [Wed, 13 Apr 2016 00:33:25 +0000 (00:33 +0000)]
Merge "update station to show ranking and autobundles" into nyc-dev am:
106d8e5
am:
7b4a9dc
* commit '
7b4a9dc9ccf44aa738c1cb1834c593c91db383e6':
update station to show ranking and autobundles
Change-Id: I049fa6fe4746532547d0c7f65a9c603c50e6dbb5
Jason Monk [Wed, 13 Apr 2016 00:33:25 +0000 (00:33 +0000)]
Merge "Guard against empty extraInfo" into nyc-dev am:
b63a4f8
am:
de27b15
* commit '
de27b15329e11a9787bead8560d08b530bdce089':
Guard against empty extraInfo
Change-Id: I4ddf00b0d159e8c085049f9566f19433e4a2fc8c
Jason Monk [Wed, 13 Apr 2016 00:33:24 +0000 (00:33 +0000)]
Merge "Work on settings startup speed" into nyc-dev am:
1fd25b9
am:
3d4b96a -s ours
* commit '
3d4b96a46ffd44e0bc769eda90bf37043866cca2':
Work on settings startup speed
Change-Id: Iaf559a57f57c2ec0bfd3e9a2d8caeb8882fcb936
Suprabh Shukla [Tue, 12 Apr 2016 22:57:11 +0000 (15:57 -0700)]
Clearing cache for managed profile apps
Added code to loop over all the child profiles and delete application
cache files for them, when clearing cache from Settings->Storage
Bug: b/
25338468
Change-Id: I87dba56218402be44b71a009e93b2e93f48a574c
Jason Monk [Tue, 12 Apr 2016 23:40:50 +0000 (23:40 +0000)]
Merge "Disable animations for bluetooth." into nyc-dev am:
90886f6
am:
b1a1722
* commit '
b1a172222834d1935f6418420c1f7e820e030463':
Disable animations for bluetooth.
Change-Id: I2d99956f648d120798c073484db10e4684c6201a
Chris Wren [Tue, 12 Apr 2016 22:44:49 +0000 (22:44 +0000)]
Merge "update station to show ranking and autobundles" into nyc-dev
am:
106d8e5
* commit '
106d8e57cee93afbd25587b75455ec78f1853271':
update station to show ranking and autobundles
Change-Id: I7eb816701684c9d48e450d3f01046eece3c3d5b2
Jason Monk [Tue, 12 Apr 2016 22:44:49 +0000 (22:44 +0000)]
Merge "Guard against empty extraInfo" into nyc-dev
am:
b63a4f8
* commit '
b63a4f87416bcf3170411fc336529ca8f5d14626':
Guard against empty extraInfo
Change-Id: Iea0c1172f484554a16d8c718b24f02e9e315ac0e
Jason Monk [Tue, 12 Apr 2016 22:44:49 +0000 (22:44 +0000)]
Merge "Work on settings startup speed" into nyc-dev
am:
1fd25b9
* commit '
1fd25b982a5d80a13b4e34e2c3130dd2d7f856a6':
Work on settings startup speed
Change-Id: Ib1ba9c56085a3a18e691bdda63a62528e0a829e3
Jason Monk [Tue, 12 Apr 2016 22:44:48 +0000 (22:44 +0000)]
Merge "Disable animations for bluetooth." into nyc-dev
am:
90886f6
* commit '
90886f66f6c27ed3c67c32983aa0214e521e2d24':
Disable animations for bluetooth.
Change-Id: I7325068e38900c7f1a16a1a8685a941ecc12707b
Chris Wren [Tue, 12 Apr 2016 21:02:15 +0000 (21:02 +0000)]
Merge "update station to show ranking and autobundles" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 20:11:16 +0000 (20:11 +0000)]
Merge "Guard against empty extraInfo" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 20:11:00 +0000 (20:11 +0000)]
Merge "Work on settings startup speed" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 20:03:39 +0000 (16:03 -0400)]
Guard against empty extraInfo
Change-Id: Iff297637edd3ebf5b6d26bc1dc51e9c17393e24f
Fixes:
27999693
Jason Monk [Tue, 12 Apr 2016 15:35:02 +0000 (11:35 -0400)]
Work on settings startup speed
- Cut down on amount stored in conditions xml
- Remove extra work from dashboard startup
- Move summary to min priority
Change-Id: I51ca3828e4446632d6faa60dcfbab3446d19d335
Fixes:
28134360
Jason Monk [Tue, 12 Apr 2016 19:18:47 +0000 (19:18 +0000)]
Merge "Disable animations for bluetooth." into nyc-dev
Jason Monk [Tue, 12 Apr 2016 19:14:37 +0000 (19:14 +0000)]
Merge "Add demo mode to dev options" into nyc-dev am:
7b5c400
am:
2230710
* commit '
2230710d319745294f44b696d09301f15f281493':
Add demo mode to dev options
Change-Id: I54c5a963461127e04f7169ecc90ba367f4883dd1
Jason Monk [Tue, 12 Apr 2016 19:07:47 +0000 (19:07 +0000)]
Merge "Add demo mode to dev options" into nyc-dev
am:
7b5c400
* commit '
7b5c4007e224a00933029f9874d7d830b8a70742':
Add demo mode to dev options
Change-Id: I48eefd0ae371f09f8841b1aaa113cea7e208a5a9
Sudheer Shanka [Tue, 12 Apr 2016 18:55:49 +0000 (18:55 +0000)]
Merge "Auto-link web urls in support messages." into nyc-dev am:
67d068e
am:
6cd4555
* commit '
6cd4555ac4577a025fab54a09907290398f52207':
Auto-link web urls in support messages.
Change-Id: I891fb47cf6c1ff220d5cf9c90d9f4fe12fcf3d1e
Felipe Leme [Tue, 12 Apr 2016 18:55:48 +0000 (18:55 +0000)]
Merge "Make "Take bugreport" dialog scrollable." into nyc-dev am:
5cbac88
am:
0b2a97f
* commit '
0b2a97fa5a6318214f8c227f863191119966f144':
Make "Take bugreport" dialog scrollable.
Change-Id: I2b8b541d51cf7ba47209086c85a460b55b5455a3
Noah Wang [Tue, 12 Apr 2016 18:55:48 +0000 (18:55 +0000)]
Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug:
27911511" into nyc-dev am:
0d03c3b
am:
e362ed3
* commit '
e362ed3267dcecc50364b734c3237481f6a6d3c1':
Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug:
27911511
Change-Id: Ia3b26bc7e848ea01de9abf6f83b0e27fbcec7363
Noah Wang [Tue, 12 Apr 2016 18:55:47 +0000 (18:55 +0000)]
Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug:
27142332" into nyc-dev am:
858a1c6
am:
d9c591b
* commit '
d9c591bda00ec7576aecd890083e30162d6277dd':
Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug:
27142332
Change-Id: I33bfa8255604141f6950c38e01413fc4ba69d068
Jorim Jaggi [Tue, 12 Apr 2016 18:55:47 +0000 (18:55 +0000)]
Merge "Always update value of screenshot preference" into nyc-dev am:
0493422
am:
0df85e3
* commit '
0df85e3e235e666b4122a77acfb3ff8fea0bd375':
Always update value of screenshot preference
Change-Id: I6bb2472b151626d1a5a946e6cbb659e0dc64da07
Udam Saini [Tue, 12 Apr 2016 18:55:46 +0000 (18:55 +0000)]
Merge "Increase string char limit." into nyc-dev am:
7f6ba63
am:
0ec0ffd
* commit '
0ec0ffde587d87edffb75bf5ffae4a2024b2409a':
Increase string char limit.
Change-Id: I60961d02c21bc409996ac100ba6d5fff1f6194cc
Jason Monk [Tue, 12 Apr 2016 18:53:18 +0000 (18:53 +0000)]
Merge "Add demo mode to dev options" into nyc-dev
Sudheer Shanka [Tue, 12 Apr 2016 18:50:28 +0000 (18:50 +0000)]
Merge "Auto-link web urls in support messages." into nyc-dev
am:
67d068e
* commit '
67d068e57749fa82ec54794d616a10e0e0a592b1':
Auto-link web urls in support messages.
Change-Id: I28f26bc84e009c7a199ef9cead16cdbb92d1018c
Felipe Leme [Tue, 12 Apr 2016 18:50:27 +0000 (18:50 +0000)]
Merge "Make "Take bugreport" dialog scrollable." into nyc-dev
am:
5cbac88
* commit '
5cbac8884118d8618da7af4a3a42d7b67bcdb77e':
Make "Take bugreport" dialog scrollable.
Change-Id: I8e6e3ddb2a96b2fd12756794d39aa275a9e6c98a
Noah Wang [Tue, 12 Apr 2016 18:50:27 +0000 (18:50 +0000)]
Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug:
27911511" into nyc-dev
am:
0d03c3b
* commit '
0d03c3b524181dd5a6dc0e8db734f1cb32ed8745':
Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug:
27911511
Change-Id: I2924e7bd2d26c0b56815ca2dd879e375ae94f48f
Noah Wang [Tue, 12 Apr 2016 18:50:27 +0000 (18:50 +0000)]
Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug:
27142332" into nyc-dev
am:
858a1c6
* commit '
858a1c6f202865641c2f79fb919c13c2ae8c6f1a':
Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug:
27142332
Change-Id: If3caec0fe2bc386b650c6e6f7f6ab3d73ec96b10
Jorim Jaggi [Tue, 12 Apr 2016 18:50:26 +0000 (18:50 +0000)]
Merge "Always update value of screenshot preference" into nyc-dev
am:
0493422
* commit '
0493422de2a6c1f6ed5443ac6ebaa72fc844cef4':
Always update value of screenshot preference
Change-Id: I9d00cfce4dbd8b9baf8aa4ce103e6dcd11c5496a
Udam Saini [Tue, 12 Apr 2016 18:50:25 +0000 (18:50 +0000)]
Merge "Increase string char limit." into nyc-dev
am:
7f6ba63
* commit '
7f6ba63fcf7692bec0af1a5eec3fe1e77e58a9f9':
Increase string char limit.
Change-Id: I6ca7f13286ef630b0770b7e67d4ebea8d9d1f395
Jason Monk [Tue, 12 Apr 2016 18:45:41 +0000 (14:45 -0400)]
Disable animations for bluetooth.
Change-Id: I2aa77d8ce91f81b6704b4f91766ee61c79afb2f8
Fixes:
28135206
Sudheer Shanka [Tue, 12 Apr 2016 18:44:40 +0000 (18:44 +0000)]
Merge "Auto-link web urls in support messages." into nyc-dev
Felipe Leme [Tue, 12 Apr 2016 18:41:16 +0000 (18:41 +0000)]
Merge "Make "Take bugreport" dialog scrollable." into nyc-dev
Noah Wang [Tue, 12 Apr 2016 18:38:50 +0000 (18:38 +0000)]
Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug:
27911511" into nyc-dev
Noah Wang [Tue, 12 Apr 2016 18:38:29 +0000 (18:38 +0000)]
Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug:
27142332" into nyc-dev
Jorim Jaggi [Tue, 12 Apr 2016 18:13:00 +0000 (18:13 +0000)]
Merge "Always update value of screenshot preference" into nyc-dev
Udam Saini [Tue, 12 Apr 2016 17:42:53 +0000 (17:42 +0000)]
Merge "Increase string char limit." into nyc-dev
Ricky Wai [Tue, 12 Apr 2016 17:16:23 +0000 (17:16 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev am:
8e91558
am:
16d93fb
* commit '
16d93fbae43639ae421045b4fcbcc650fec02865':
Do not update unified setting before updating primary profile lock
Change-Id: I99b287d03411311d807d739e529813d80dd82adc
Felipe Leme [Tue, 12 Apr 2016 16:39:45 +0000 (09:39 -0700)]
Make "Take bugreport" dialog scrollable.
Without scrolling, such dialog might not fit on small screens, specially
on multi-window environments.
BUG:
28137501
Change-Id: I84ed1ff946d1023712efcf80f15bac4a57966f19
Ricky Wai [Tue, 12 Apr 2016 17:11:05 +0000 (17:11 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev
am:
8e91558
* commit '
8e91558c0a70a042e0fcbabb8e9c536c9f23b47f':
Do not update unified setting before updating primary profile lock
Change-Id: Ibd55f7cd0bfce0361494246d3c9ba7cb0f3d0f5d
Jason Monk [Tue, 12 Apr 2016 17:09:13 +0000 (13:09 -0400)]
Add demo mode to dev options
Change-Id: I8c12dc55aef99b54d8d12f7d34e69ca77408f5b2
Fixes:
27919212
Ricky Wai [Tue, 12 Apr 2016 16:57:03 +0000 (16:57 +0000)]
Merge "Do not update unified setting before updating primary profile lock" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:56:21 +0000 (16:56 +0000)]
Merge "Fix switchbar margin" into nyc-dev am:
eb72900
am:
6e7b095
* commit '
6e7b09561f7019b4684f55c26fa075180f882bfe':
Fix switchbar margin
Change-Id: Id711bb8464fe556af06d2d3e79cb48162e248351
Jason Monk [Tue, 12 Apr 2016 16:56:21 +0000 (16:56 +0000)]
Merge "Settings dashboard performance work" into nyc-dev am:
36ac2a1
am:
fb60f61
* commit '
fb60f61b56647dadaaf5035b8610c48e7ce44a4b':
Settings dashboard performance work
Change-Id: I26686589f1a4fe07dc32541fe67751e6c1f07345
Jason Monk [Tue, 12 Apr 2016 16:50:32 +0000 (16:50 +0000)]
Merge "Fix switchbar margin" into nyc-dev
am:
eb72900
* commit '
eb7290055c377cf9f6136cc609646c0f897587a2':
Fix switchbar margin
Change-Id: I45abaf3127a7402d473389ece8cba0a12b690605
Jason Monk [Tue, 12 Apr 2016 16:50:32 +0000 (16:50 +0000)]
Merge "Settings dashboard performance work" into nyc-dev
am:
36ac2a1
* commit '
36ac2a1eab550a69b787ab1df0ab5e11aa6c4687':
Settings dashboard performance work
Change-Id: Ie777a3437797b17abf1627298f37af0054e785e3
Jason Monk [Tue, 12 Apr 2016 16:38:08 +0000 (16:38 +0000)]
Merge "Fix switchbar margin" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:35:43 +0000 (16:35 +0000)]
Merge "Settings dashboard performance work" into nyc-dev
Jason Monk [Tue, 12 Apr 2016 16:35:01 +0000 (12:35 -0400)]
Fix switchbar margin
All screens have an up arrow or a drawer icon so the switchbar should
always have the subsettings margin.
Change-Id: If016dc718612d1a26c4e01a5e3f6c8f2f88c6fc1
Fixes:
27599891
Ricky Wai [Tue, 12 Apr 2016 16:34:59 +0000 (17:34 +0100)]
Do not update unified setting before updating primary profile lock
Bug:
28135945
Change-Id: Ib6332f42d3b6416d8fd08d5f829bf9852fa0e9f0
Sanket Padawe [Tue, 12 Apr 2016 16:12:01 +0000 (16:12 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev am:
348a5c4
am:
5f16c14d
* commit '
5f16c14d155be9021832a06df1824a9d29634649':
Fix UI issue in Sim Settings screen.
Change-Id: Ie9abbc180601acde2f6e8102358bccb397a93314
Sanket Padawe [Tue, 12 Apr 2016 16:06:27 +0000 (16:06 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev
am:
348a5c4
* commit '
348a5c4c35038dd138c94e2c8f629da4e71dcd9d':
Fix UI issue in Sim Settings screen.
Change-Id: I1c8567506e93e2ab0476da680b7a482c80f6b818
Sanket Padawe [Tue, 12 Apr 2016 15:58:06 +0000 (15:58 +0000)]
Merge "Fix UI issue in Sim Settings screen." into nyc-dev
Jason Monk [Tue, 12 Apr 2016 14:32:20 +0000 (10:32 -0400)]
Settings dashboard performance work
- Don't block main thread with rebuild work
- Don't run rebuild as foreground priority
- Don't use comparator on apps/notifications summaries, we don't
care about order
- Simplify dashboard item layout
Change-Id: I33bdd06a234ea308b44b45cac5ed1e9eac1c7d43
Fixes:
26541310
Ricky Wai [Tue, 12 Apr 2016 11:20:54 +0000 (11:20 +0000)]
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
Daniel U [Tue, 12 Apr 2016 11:15:24 +0000 (11:15 +0000)]
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
Ricky Wai [Tue, 12 Apr 2016 11:06:25 +0000 (11:06 +0000)]
Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
Jorim Jaggi [Tue, 12 Apr 2016 02:17:59 +0000 (19:17 -0700)]
Always update value of screenshot preference
Bug:
26014678
Change-Id: I6127dee5c911171bc9b708dfe1e9ee21b17d0833
Nathan Harold [Tue, 12 Apr 2016 01:19:23 +0000 (01:19 +0000)]
Cleanup RadioInfo Test Menu am:
2b77d74
am:
262b404
* commit '
262b404cf9d6c3360439ec2a1b9a153db8ac4a16':
Cleanup RadioInfo Test Menu
Change-Id: I343d6654b9a1b923d383d34a4aca6773012e4700
Nathan Harold [Tue, 12 Apr 2016 01:14:23 +0000 (01:14 +0000)]
Cleanup RadioInfo Test Menu
am:
2b77d74
* commit '
2b77d7460ccebd97826529f186596df14050f0ae':
Cleanup RadioInfo Test Menu
Change-Id: I63f6638893e60e0eef75396d3bee0d8bf223cff1
Noah Wang [Sun, 10 Apr 2016 10:57:24 +0000 (03:57 -0700)]
Postpone commit on PreviewSeekBarPreferenceFragment
until the cross-fade animation has completed
Bug:
27142332
Change-Id: I6c11e89398bad34a3b92560cb73c667a3cfd4786
Nathan Harold [Sat, 19 Mar 2016 20:22:10 +0000 (13:22 -0700)]
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
Noah Wang [Sun, 10 Apr 2016 06:24:47 +0000 (23:24 -0700)]
Fix content description and accessibility focus on
PreviewSeekBarPreferenceFragment.
Bug:
27911511
Change-Id: I45673e582a29028cb0598669b0fa1a48c071181d
Fan Zhang [Mon, 11 Apr 2016 20:45:15 +0000 (20:45 +0000)]
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."
Jason Monk [Mon, 11 Apr 2016 19:11:46 +0000 (19:11 +0000)]
Merge "Fix battery history details" into nyc-dev am:
43fa74b
am:
9eeb3f3
* commit '
9eeb3f3d2d7892ca540ae6dc9567d1816dcf0613':
Fix battery history details
Change-Id: I3c3bf2755ca8d7e2cca0cbf3277d1d515c8c072e
Jason Monk [Mon, 11 Apr 2016 19:06:55 +0000 (19:06 +0000)]
Merge "Fix battery history details" into nyc-dev
am:
43fa74b
* commit '
43fa74b9fdaf8398d0c1498311b307fbfea135a0':
Fix battery history details
Change-Id: I57cc3e650cb9b1d0ff0d786dc6e27179d27107bb
Jason Monk [Mon, 11 Apr 2016 18:58:25 +0000 (18:58 +0000)]
Merge "Fix battery history details" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 18:55:34 +0000 (14:55 -0400)]
Fix battery history details
Change-Id: Ibf73d28d227574cba0866accdf7c9dc810b24906
Fixes:
27844566
Alan Viverette [Mon, 11 Apr 2016 18:52:26 +0000 (18:52 +0000)]
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
Alan Viverette [Mon, 11 Apr 2016 18:48:44 +0000 (18:48 +0000)]
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
Alan Viverette [Mon, 11 Apr 2016 18:32:22 +0000 (18:32 +0000)]
Merge "Fix EBT helper initialization in LabeledSeekBar class" into nyc-dev
Fyodor Kupolov [Mon, 11 Apr 2016 17:03:16 +0000 (17:03 +0000)]
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
Fan Zhang [Mon, 11 Apr 2016 16:25:04 +0000 (16:25 +0000)]
Revert "Add suggestion carousel view and dependencies to settings"
This reverts commit
0050ac0bb759d15539c7551ea6149e521ad0cc08.
Change-Id: Ic61137bae0fa1a6de5ba4970e8a3a3b4fe0469a3
Fan Zhang [Mon, 11 Apr 2016 16:17:57 +0000 (09:17 -0700)]
Remove DashboardStatusFragment and hide sliding tab layout.
Bug:
28090184
Change-Id: I34ff46d0f5ba87c824d1484f1018fad154696e15
Fyodor Kupolov [Mon, 11 Apr 2016 16:50:37 +0000 (16:50 +0000)]
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
Fyodor Kupolov [Mon, 11 Apr 2016 16:40:54 +0000 (16:40 +0000)]
Merge "Added getProfileIds method returning array of userIds" into nyc-dev
Chris Wren [Fri, 8 Apr 2016 21:28:01 +0000 (17:28 -0400)]
update station to show ranking and autobundles
Bug:
26919636
Change-Id: I5f1ce737ca2d06e6706c3248bd09bd40ef36774f
Fan Zhang [Mon, 11 Apr 2016 16:09:39 +0000 (16:09 +0000)]
Revert "Add a RecyclerView adapter for first tab in settings."
This reverts commit
44e7be1289d99b4d6720bbd9ac82d23671ea7b69.
Change-Id: I1391f41a19526ebd02a0c06e628fb1e18d454a71
Fan Zhang [Mon, 11 Apr 2016 15:26:54 +0000 (15:26 +0000)]
Revert "Dashboard status cards UI."
This reverts commit
d42e233bf0e5132cc1592fe9932532474e3fb84b.
Change-Id: I58b4bcb2e153da26fb043bff2ce58d2c474b567b
Jason Monk [Mon, 11 Apr 2016 14:32:32 +0000 (14:32 +0000)]
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
Jason Monk [Mon, 11 Apr 2016 14:31:39 +0000 (14:31 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev am:
3095c77
am:
4fbb0e3
* commit '
4fbb0e35e8a44b23b4f9a95ccdfb5e094c663f5c':
Guard against crash in SummaryProvider
Change-Id: I8223bac4b7d8cf17f4cd4a47c479c2c2b95160e7
Jason Monk [Mon, 11 Apr 2016 14:31:38 +0000 (14:31 +0000)]
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
Jason Monk [Mon, 11 Apr 2016 14:31:38 +0000 (14:31 +0000)]
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
Jason Monk [Mon, 11 Apr 2016 14:28:23 +0000 (14:28 +0000)]
Merge "Pull pref summaries from power usage summary" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:26:50 +0000 (14:26 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev
am:
3095c77
* commit '
3095c77d5b28839ff6e757d6c08afd1bd2cd7afa':
Guard against crash in SummaryProvider
Change-Id: I759042100f3b4f21b9056d83b817634f066fae93
Jason Monk [Mon, 11 Apr 2016 14:26:50 +0000 (14:26 +0000)]
Merge "Remove OpenGL traces from dev settings" into nyc-dev
am:
eeb2a19
* commit '
eeb2a19a50c0fa1792ed163b555d0bddf217080f':
Remove OpenGL traces from dev settings
Change-Id: Ia36a2187188f103da55e1066754ef764cc90c341
Jason Monk [Mon, 11 Apr 2016 14:25:04 +0000 (10:25 -0400)]
Pull pref summaries from power usage summary
Change-Id: I9bd3d1041576e183e7e5e03aaecc5128ea5227c2
Fixes:
27644604
Jason Monk [Mon, 11 Apr 2016 14:23:36 +0000 (14:23 +0000)]
Merge "Guard against crash in SummaryProvider" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:21:28 +0000 (10:21 -0400)]
Guard against crash in SummaryProvider
Change-Id: Ieeae65e50211618dbbee3d320cae614ac5926543
Fixes:
26310547
Jason Monk [Mon, 11 Apr 2016 14:20:17 +0000 (14:20 +0000)]
Fix localization issues with disabled am:
9e9ba0d
am:
22b5064
* commit '
22b5064424547daf4cdda5d106aa559539e89c23':
Fix localization issues with disabled
Change-Id: I958dffd6f1c8370d5408b811a804411095a9eb74
Jason Monk [Mon, 11 Apr 2016 14:19:55 +0000 (14:19 +0000)]
Merge "Remove OpenGL traces from dev settings" into nyc-dev
Jason Monk [Mon, 11 Apr 2016 14:17:53 +0000 (10:17 -0400)]
Remove OpenGL traces from dev settings
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes:
26741446
Jason Monk [Mon, 11 Apr 2016 14:14:53 +0000 (14:14 +0000)]
Fix localization issues with disabled
am:
9e9ba0d
* commit '
9e9ba0d75142c7af9d8f7eabb7dfd34ff59e2064':
Fix localization issues with disabled
Change-Id: If37b22b8dd44ad42265227b20c449acc97b06bb4
OSDN Git Service
