OSDN Git Service
Brian Carlstrom [Tue, 16 Jun 2015 23:25:53 +0000 (23:25 +0000)]
am
99c1009a: am
49d73c03: am
94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
* commit '
99c1009a897834e8282a59c0dda8f29dd33234e4':
dex2oat should show something friendlier in Settings -> Battery
Brian Carlstrom [Tue, 16 Jun 2015 23:18:33 +0000 (23:18 +0000)]
am
49d73c03: am
94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
* commit '
49d73c03aa5b8b21c5e8a926b6a894245ffdf906':
dex2oat should show something friendlier in Settings -> Battery
Brian Carlstrom [Tue, 16 Jun 2015 23:07:52 +0000 (23:07 +0000)]
am
94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
* commit '
94f4cb4e4660db823d268d14eb1199dbc11f8e86':
dex2oat should show something friendlier in Settings -> Battery
Jeff Sharkey [Tue, 16 Jun 2015 23:00:45 +0000 (23:00 +0000)]
am
aa1e5f2f: am
5fafa130: am
95b891af: Merge "Finish storage wizard theming." into mnc-dev
* commit '
aa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa':
Finish storage wizard theming.
Makoto Onuki [Tue, 16 Jun 2015 23:00:44 +0000 (23:00 +0000)]
am
3f507b2f: am
abf80cb1: am
d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev
* commit '
3f507b2fbdbb8d1daac4703d365a740dbc4623f4':
Allow formatting when a partition is corrupt.
Brian Carlstrom [Tue, 16 Jun 2015 22:59:03 +0000 (22:59 +0000)]
Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 22:49:20 +0000 (22:49 +0000)]
am
5fafa130: am
95b891af: Merge "Finish storage wizard theming." into mnc-dev
* commit '
5fafa130ec8f031310e5372a89034057053fa634':
Finish storage wizard theming.
Makoto Onuki [Tue, 16 Jun 2015 22:49:19 +0000 (22:49 +0000)]
am
abf80cb1: am
d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev
* commit '
abf80cb1d058aa96abd29a329a6f79b6e62acad9':
Allow formatting when a partition is corrupt.
Jeff Sharkey [Tue, 16 Jun 2015 22:36:06 +0000 (22:36 +0000)]
am
95b891af: Merge "Finish storage wizard theming." into mnc-dev
* commit '
95b891af7c77d51f6284e01467bd6323d3749068':
Finish storage wizard theming.
Makoto Onuki [Tue, 16 Jun 2015 22:36:05 +0000 (22:36 +0000)]
am
d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev
* commit '
d91ddfeb16f3019807e2d0146f774975acef36bd':
Allow formatting when a partition is corrupt.
Jeff Sharkey [Tue, 16 Jun 2015 22:31:27 +0000 (22:31 +0000)]
Merge "Finish storage wizard theming." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 20:52:10 +0000 (13:52 -0700)]
Finish storage wizard theming.
Storage wizard screens now have updated assets from UX, and various
assets are tinted consistently. We're using our own navigation bar
and wholesale replacing the layout from upstream.
Fix text colors in night mode. Tell SystemUI when we're finished
with the wizard flow.
Bug:
21830731
Change-Id: Ic8d09cc152bfb4dcc6089b5c61d28cbdd4be3ee9
Makoto Onuki [Tue, 16 Jun 2015 22:27:08 +0000 (22:27 +0000)]
Merge "Allow formatting when a partition is corrupt." into mnc-dev
Jason Monk [Tue, 16 Jun 2015 21:42:57 +0000 (21:42 +0000)]
am
24db3674: (-s ours) am
283c469d: am
e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
* commit '
24db3674afa127756252c0220a431722a0d362f7':
Remove theme setting DO NOT MERGE
Jason Monk [Tue, 16 Jun 2015 21:42:56 +0000 (21:42 +0000)]
am
23d6ab34: am
fbebf8cf: am
254e8aea: Merge "Update for shortcuts" into mnc-dev
* commit '
23d6ab342affc30fb101d2481aeb6d497b857d49':
Update for shortcuts
Yorke Lee [Tue, 16 Jun 2015 21:42:54 +0000 (21:42 +0000)]
am
c47e89a4: am
0d736b59: am
610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev
* commit '
c47e89a44c388fa7cb650592878730e3e814a4ed':
Send broadcast when default dialer changes
Jason Monk [Tue, 16 Jun 2015 21:42:52 +0000 (21:42 +0000)]
am
9afed461: am
20d32181: am
d0eab40a: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
* commit '
9afed461061b7e07e0285df68ab587a0455cfe8f':
Don't show work apps in ignore optimizations list
Jason Monk [Tue, 16 Jun 2015 21:42:50 +0000 (21:42 +0000)]
am
18c5d20b: am
0af2586a: am
455cea62: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
* commit '
18c5d20bd3acc0048b08aba6ab0d03f882118a53':
Add warning for disabling usage access on prof owners
Sanket Padawe [Tue, 16 Jun 2015 21:42:47 +0000 (21:42 +0000)]
am
3c2f469b: am
fc4e9cbd: am
7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
* commit '
3c2f469bf9d804bdb60bd0fea618cbc883db5ab6':
Add PBAP checkbox for BT pairing consent dialog.
Jason Monk [Tue, 16 Jun 2015 21:42:44 +0000 (21:42 +0000)]
am
464ad14d: am
808f7826: am
6e613472: Start all help intents as startActivityForResult
* commit '
464ad14d376358a8162854591f44071919c87a75':
Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 21:42:43 +0000 (21:42 +0000)]
am
27fe38eb: am
4c1f455c: am
744f2adb: Merge "Layout refinement for app lists" into mnc-dev
* commit '
27fe38eb2c3b10d28c570ae60221c7ae5c54dcbd':
Layout refinement for app lists
Jason Monk [Tue, 16 Jun 2015 21:26:03 +0000 (21:26 +0000)]
am
283c469d: am
e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
* commit '
283c469dc82841827d3dd2e7052f68c5e71f1425':
Remove theme setting DO NOT MERGE
Jason Monk [Tue, 16 Jun 2015 21:25:48 +0000 (21:25 +0000)]
am
fbebf8cf: am
254e8aea: Merge "Update for shortcuts" into mnc-dev
* commit '
fbebf8cfc4a612b6708d024ce71e8069e87cd310':
Update for shortcuts
Yorke Lee [Tue, 16 Jun 2015 21:23:13 +0000 (21:23 +0000)]
am
0d736b59: am
610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev
* commit '
0d736b59d88ffd7dd5ea7c823669d69dcf14737e':
Send broadcast when default dialer changes
Jason Monk [Tue, 16 Jun 2015 21:23:12 +0000 (21:23 +0000)]
am
20d32181: am
d0eab40a: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
* commit '
20d3218182fa24dfba48adab8002af383cfe2ae7':
Don't show work apps in ignore optimizations list
Jason Monk [Tue, 16 Jun 2015 21:23:10 +0000 (21:23 +0000)]
am
0af2586a: am
455cea62: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
* commit '
0af2586ad75e64f3c8bc12dccbad2d64ef208159':
Add warning for disabling usage access on prof owners
Sanket Padawe [Tue, 16 Jun 2015 21:23:09 +0000 (21:23 +0000)]
am
fc4e9cbd: am
7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
* commit '
fc4e9cbdf928b6b8bcbdd96a9940e0333a49193e':
Add PBAP checkbox for BT pairing consent dialog.
Jason Monk [Tue, 16 Jun 2015 21:23:08 +0000 (21:23 +0000)]
am
808f7826: am
6e613472: Start all help intents as startActivityForResult
* commit '
808f7826b1259c6f0344d5273b7855c93cfe44f7':
Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 21:23:07 +0000 (21:23 +0000)]
am
4c1f455c: am
744f2adb: Merge "Layout refinement for app lists" into mnc-dev
* commit '
4c1f455cac4ed69a1dec0ce5c75323301d288e1b':
Layout refinement for app lists
Makoto Onuki [Tue, 16 Jun 2015 17:40:44 +0000 (10:40 -0700)]
Allow formatting when a partition is corrupt.
Bug
21848166
Change-Id: Ied8efaa1320c49a01ae08f19461bf125b3ffa97f
Jason Monk [Tue, 16 Jun 2015 21:03:11 +0000 (21:03 +0000)]
am
e9ec307a: Merge "Remove theme setting DO NOT MERGE" into mnc-dev
* commit '
e9ec307a057618ff40b9988684761a778f9301d4':
Remove theme setting DO NOT MERGE
Jason Monk [Tue, 16 Jun 2015 20:49:54 +0000 (20:49 +0000)]
Merge "Remove theme setting DO NOT MERGE" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 20:45:22 +0000 (20:45 +0000)]
am
254e8aea: Merge "Update for shortcuts" into mnc-dev
* commit '
254e8aea22f36c90587315a58aeefda9683581eb':
Update for shortcuts
Jason Monk [Tue, 16 Jun 2015 20:40:50 +0000 (16:40 -0400)]
Remove theme setting DO NOT MERGE
Because it's just too incredibly useful...
Bug:
21854466
Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2
Jason Monk [Tue, 16 Jun 2015 20:36:45 +0000 (20:36 +0000)]
Merge "Update for shortcuts" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:00:41 +0000 (15:00 -0400)]
Update for shortcuts
Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
Yorke Lee [Tue, 16 Jun 2015 20:08:30 +0000 (20:08 +0000)]
am
610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev
* commit '
610413d307f0a65b26d2ffb04f8389c1fe568029':
Send broadcast when default dialer changes
Jason Monk [Tue, 16 Jun 2015 20:08:28 +0000 (20:08 +0000)]
am
d0eab40a: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev
* commit '
d0eab40a573bd03aec558615c9f8806848ef11c8':
Don't show work apps in ignore optimizations list
Jason Monk [Tue, 16 Jun 2015 20:07:07 +0000 (20:07 +0000)]
am
455cea62: Merge "Add warning for disabling usage access on prof owners" into mnc-dev
* commit '
455cea62ebd137dc1a2089709aa701715fdfe395':
Add warning for disabling usage access on prof owners
Sanket Padawe [Tue, 16 Jun 2015 20:06:46 +0000 (20:06 +0000)]
am
7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
* commit '
7171d6864fb4d8c1838b4ef1d65b6bb5274d3b53':
Add PBAP checkbox for BT pairing consent dialog.
Jason Monk [Tue, 16 Jun 2015 20:06:44 +0000 (20:06 +0000)]
am
6e613472: Start all help intents as startActivityForResult
* commit '
6e61347242ea8d9ac0645b2669f222696c65eec6':
Start all help intents as startActivityForResult
Jason Monk [Tue, 16 Jun 2015 20:06:29 +0000 (20:06 +0000)]
am
744f2adb: Merge "Layout refinement for app lists" into mnc-dev
* commit '
744f2adb56ac0077a103c8e6e3b20f421eddc780':
Layout refinement for app lists
Yorke Lee [Tue, 16 Jun 2015 19:30:13 +0000 (19:30 +0000)]
Merge "Send broadcast when default dialer changes" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 19:26:40 +0000 (19:26 +0000)]
Merge "Don't show work apps in ignore optimizations list" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 18:18:26 +0000 (14:18 -0400)]
Don't show work apps in ignore optimizations list
The setting is global, so we only ever need one of each app.
Bug:
21847753
Change-Id: Ib04061d87b9deb81a579ad110451f2f55ec7aeff
Jason Monk [Tue, 16 Jun 2015 16:46:46 +0000 (16:46 +0000)]
Merge "Add warning for disabling usage access on prof owners" into mnc-dev
Jason Monk [Tue, 16 Jun 2015 13:10:00 +0000 (09:10 -0400)]
Add warning for disabling usage access on prof owners
Bug:
20751702
Change-Id: Id0f54f06c3bf05c32a973ad805c116cbae96028a
Sanket Padawe [Tue, 16 Jun 2015 15:24:04 +0000 (15:24 +0000)]
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
Jason Monk [Tue, 16 Jun 2015 14:31:38 +0000 (10:31 -0400)]
Start all help intents as startActivityForResult
So that the receiver may verify identity if they so desire...
Bug:
21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed
Jason Monk [Tue, 16 Jun 2015 13:17:01 +0000 (13:17 +0000)]
Merge "Layout refinement for app lists" into mnc-dev
Jason Monk [Fri, 12 Jun 2015 16:32:50 +0000 (12:32 -0400)]
Layout refinement for app lists
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding. This way they
should look the same.
Bug:
21727125
Bug:
21726922
Bug:
21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
Jeff Sharkey [Tue, 16 Jun 2015 05:40:30 +0000 (05:40 +0000)]
am
57922a1e: am
a26765c4: am
9a5550e9: Check new user restriction.
* commit '
57922a1ed4caa8b062ad0781aa52c38a59b8d8a7':
Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:28:40 +0000 (05:28 +0000)]
am
a26765c4: am
9a5550e9: Check new user restriction.
* commit '
a26765c461168f745913d505d6e993181e896a19':
Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:16:50 +0000 (05:16 +0000)]
am
9a5550e9: Check new user restriction.
* commit '
9a5550e9e6efe211b03d067eae2689f6ef5eb2d1':
Check new user restriction.
Jeff Sharkey [Tue, 16 Jun 2015 05:16:43 +0000 (05:16 +0000)]
am
96b09cf5: am
3538eb24: am
71c89a17: Merge "More storage UI updates." into mnc-dev
* commit '
96b09cf59f7554b05004fa7f8ad6da1c73e8f545':
More storage UI updates.
Jeff Sharkey [Tue, 16 Jun 2015 05:06:00 +0000 (05:06 +0000)]
am
3538eb24: am
71c89a17: Merge "More storage UI updates." into mnc-dev
* commit '
3538eb2410808484b8110d83543d6c926fa870c4':
More storage UI updates.
Jeff Sharkey [Tue, 16 Jun 2015 04:57:43 +0000 (04:57 +0000)]
am
71c89a17: Merge "More storage UI updates." into mnc-dev
* commit '
71c89a171acb1ddd63d10189c39c07134987bd2f':
More storage UI updates.
Jeff Sharkey [Fri, 20 Mar 2015 18:25:22 +0000 (11:25 -0700)]
Check new user restriction.
Change-Id: I8891a4347478c243a3f1a14cf8cdf9b4784c9fab
Jeff Sharkey [Tue, 16 Jun 2015 04:47:16 +0000 (04:47 +0000)]
Merge "More storage UI updates." into mnc-dev
Jeff Sharkey [Tue, 16 Jun 2015 04:08:56 +0000 (21:08 -0700)]
More storage UI updates.
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space. Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.
Allocate a unique color for each private volume, and yell when a
volume is running low on space. Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage. Show
details dialog about "Other" and user storage items.
Shortcut into single private volume when it's the only device. Add
real eject icon.
Bug:
21756698,
20275574,
21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
Jim Miller [Tue, 16 Jun 2015 04:22:00 +0000 (04:22 +0000)]
am
861a64e8: am
6364e0a2: am
a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
861a64e8bfb3b77709a50f2223c355f43bfb867a':
Limit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 04:10:57 +0000 (04:10 +0000)]
am
6364e0a2: am
a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
6364e0a26a04cc048e8a0ff1dd9c0ed90cd45295':
Limit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 04:00:37 +0000 (04:00 +0000)]
am
a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
* commit '
a4f8aae4be4040685f88c79006d2cfee42f96504':
Limit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
Jim Miller [Tue, 16 Jun 2015 03:41:02 +0000 (20:41 -0700)]
Limit number of fingerprint templates that can be enrolled per device user
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug
20731847
Change-Id: I3975290fa8eb2106467493aab6102015697e012c
On branch max_fingerprint
Sean Francis-Lyon [Tue, 16 Jun 2015 01:49:46 +0000 (01:49 +0000)]
am
af02ae0f: am
d1f4be21: am
c44d0ef1: show old legal text in backup settings if full data backup is disabled
* commit '
af02ae0fb7d41435531d185031a2e27952c113a4':
show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Tue, 16 Jun 2015 01:42:58 +0000 (01:42 +0000)]
am
d1f4be21: am
c44d0ef1: show old legal text in backup settings if full data backup is disabled
* commit '
d1f4be219d68179c0aea245e7b66d393444688a7':
show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Tue, 16 Jun 2015 01:32:02 +0000 (01:32 +0000)]
am
c44d0ef1: show old legal text in backup settings if full data backup is disabled
* commit '
c44d0ef1dc67466fe59c1a26a657c2f9043c948b':
show old legal text in backup settings if full data backup is disabled
Sean Francis-Lyon [Sat, 13 Jun 2015 00:46:41 +0000 (17:46 -0700)]
show old legal text in backup settings if full data backup is disabled
Change-Id: Ifc4fa5c4a6180fd4ceb41ca66dc2dd6a58f4f086
Adrian Roos [Tue, 16 Jun 2015 00:18:16 +0000 (00:18 +0000)]
am
b57ca0ac: am
5d912c35: am
bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
* commit '
b57ca0aceaed55b67b91e3fc6d610503c2a1ac0b':
Use AssistUtils.getAssistInfo
Adrian Roos [Tue, 16 Jun 2015 00:05:17 +0000 (00:05 +0000)]
am
5d912c35: am
bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
* commit '
5d912c353145b893f4175fdff1ab488b0265cd4b':
Use AssistUtils.getAssistInfo
Adrian Roos [Mon, 15 Jun 2015 23:56:53 +0000 (23:56 +0000)]
am
bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
* commit '
bada978ec3eab48564c29eb4f8169e88975a2da0':
Use AssistUtils.getAssistInfo
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Use AssistUtils.getAssistInfo" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 20:32:58 +0000 (13:32 -0700)]
Use AssistUtils.getAssistInfo
Use consistent logic with SystemUI for determining
default assist component.
Bug:
21780590
Change-Id: I1313b79ce3bb75944889e3ceccb4a2e6bb23e824
Amit Mahajan [Mon, 15 Jun 2015 22:50:10 +0000 (22:50 +0000)]
am
32d93f34: am
5282bd71: am
be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
* commit '
32d93f349141ba1be95009dcb7abec121a13595f':
Change to trigger client initiated OMA-DM session on System update req.
Amit Mahajan [Mon, 15 Jun 2015 22:39:02 +0000 (22:39 +0000)]
am
5282bd71: am
be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
* commit '
5282bd71c9128bd53703b3381be0697afc7baf2a':
Change to trigger client initiated OMA-DM session on System update req.
Amit Mahajan [Mon, 15 Jun 2015 22:29:00 +0000 (22:29 +0000)]
am
be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
* commit '
be1b22e88ee24a9d53c1871da360cf7b56f4da0b':
Change to trigger client initiated OMA-DM session on System update req.
Amit Mahajan [Mon, 15 Jun 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 20:14:24 +0000 (20:14 +0000)]
am
f2903eda: am
3fdfabcd: am
dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
* commit '
f2903edadcc785135fb07a26655bf80476da35ab':
Settings: Remove unreachable "Battery Info" screen.
John Spurlock [Mon, 15 Jun 2015 20:01:55 +0000 (20:01 +0000)]
am
3fdfabcd: am
dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
* commit '
3fdfabcd4576b27c37608656c277686d73833b57':
Settings: Remove unreachable "Battery Info" screen.
Dianne Hackborn [Mon, 15 Jun 2015 19:49:39 +0000 (19:49 +0000)]
am
f4d4440f: am
f7c184f0: am
3f98c0ce: Fix issue #
21813831: Need API for asking to be added to power whitelist
* commit '
f4d4440fd4318a83ce83090a744171e336d6fd65':
Fix issue #
21813831: Need API for asking to be added to power whitelist
John Spurlock [Mon, 15 Jun 2015 19:49:30 +0000 (19:49 +0000)]
am
dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
* commit '
dddd589d8f0de00c192022ea9bd87f32a734343b':
Settings: Remove unreachable "Battery Info" screen.
Dianne Hackborn [Mon, 15 Jun 2015 19:37:09 +0000 (19:37 +0000)]
am
f7c184f0: am
3f98c0ce: Fix issue #
21813831: Need API for asking to be added to power whitelist
* commit '
f7c184f05e4f2c70835dfb7da48cc1a95e38a6e4':
Fix issue #
21813831: Need API for asking to be added to power whitelist
John Spurlock [Mon, 15 Jun 2015 19:36:45 +0000 (19:36 +0000)]
Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 19:24:16 +0000 (15:24 -0400)]
Settings: Remove unreachable "Battery Info" screen.
Bug:
21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
Dianne Hackborn [Mon, 15 Jun 2015 19:24:10 +0000 (19:24 +0000)]
am
3f98c0ce: Fix issue #
21813831: Need API for asking to be added to power whitelist
* commit '
3f98c0ce510ba95f8ecb3d815a4e722002fcf9f2':
Fix issue #
21813831: Need API for asking to be added to power whitelist
Yorke Lee [Mon, 15 Jun 2015 19:11:05 +0000 (12:11 -0700)]
Send broadcast when default dialer changes
Bug:
21846308
Change-Id: Ic92c3e39fa23dc1f2e08aa5d1dd1b27835c325cf
Dianne Hackborn [Sat, 13 Jun 2015 01:13:54 +0000 (18:13 -0700)]
Fix issue #
21813831: Need API for asking to be added to power whitelist
When launching the battery whitelist for a particular app, we now
default to the app being asked to enable adding to the whitelist, and
dismissing the dialog will dismiss the entire whitelist UI.
You can now launch the whitelist without specifying an app to just
get the regular UI.
Change-Id: Idf3840b8a30febe71fbd600969c257d72809643f
Geoff Mendal [Mon, 15 Jun 2015 16:08:08 +0000 (16:08 +0000)]
am
f665e53c: (-s ours) am
920a4b62: (-s ours) am
f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f665e53c88ebaae27783787c34bead2575c3501a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 15:59:44 +0000 (15:59 +0000)]
am
920a4b62: (-s ours) am
f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
920a4b62a36ec9a1e64e6a559425ec03ff760801':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 15:48:55 +0000 (15:48 +0000)]
am
f4d7bd4f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f4d7bd4f49077602c7d3fd096fe32b2b17f76797':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Jun 2015 15:36:59 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 15:36:21 +0000 (15:36 +0000)]
am
d6e65040: am
dfe186f5: am
49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev
* commit '
d6e65040f5030a5b2c3db29ca5f5f8735fcdecec':
Fix bad theming on owner-info
Jason Monk [Mon, 15 Jun 2015 15:24:58 +0000 (15:24 +0000)]
am
89a770fb: am
f7b0dfd6: am
f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
* commit '
89a770fb3bd86e4089e7858664380c7d7f21e578':
Don't auto-focus text fields in hotspot dialog
Jason Monk [Mon, 15 Jun 2015 15:24:53 +0000 (15:24 +0000)]
am
dfe186f5: am
49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev
* commit '
dfe186f57c4f8cc04ca3b179e3dcae6d6c76fbc0':
Fix bad theming on owner-info
Jason Monk [Mon, 15 Jun 2015 15:12:48 +0000 (15:12 +0000)]
am
f7b0dfd6: am
f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
* commit '
f7b0dfd6aeff9c02e479c2ce6f2ddc97baa09331':
Don't auto-focus text fields in hotspot dialog
Jason Monk [Mon, 15 Jun 2015 15:11:59 +0000 (15:11 +0000)]
am
49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev
* commit '
49ecfcd690a73112024df188924892772408d170':
Fix bad theming on owner-info
Jason Monk [Mon, 15 Jun 2015 15:05:33 +0000 (15:05 +0000)]
Merge "Fix bad theming on owner-info" into mnc-dev
Jason Monk [Mon, 15 Jun 2015 14:58:50 +0000 (10:58 -0400)]
Fix bad theming on owner-info
Bug:
21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
Jason Monk [Mon, 15 Jun 2015 15:00:20 +0000 (15:00 +0000)]
am
f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
* commit '
f0fe5c58e2274a550321f936c125c691f7a1646b':
Don't auto-focus text fields in hotspot dialog
OSDN Git Service
