Commit Graph

3452 Commits

Author SHA1 Message Date
Nick Kralevich
3cb9434ca1 am a864e46b: am 20a0da89: am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
* commit 'a864e46b47ea20694ce9366295d997a1debffa02':
  Fix bad USB configuration under Developer Options
2015-06-13 03:43:22 +00:00
Nick Kralevich
64a8032f44 Merge "Fix bad USB configuration under Developer Options" into mnc-dev 2015-06-13 03:12:08 +00:00
Sanket Padawe
2ef44c5e5d Add PBAP checkbox for BT pairing consent dialog.
Bug: 20488109
Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
2015-06-12 18:09:45 -07:00
Nick Kralevich
9cff8cdfe0 Fix bad USB configuration under Developer Options
The USB configuration screen under Developer Options hasn't been
updated for the new USB access control changes. Update it.

1) Ensure that the default in Development Settings is "Charger Only".
2) Changing USB mode in developer settings only changes the USB function.
It doesn't unlock any USB data.

Bug: 21258972
Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
2015-06-12 16:30:45 -07:00
Selim Cinek
e0c9e0f4ce am 827c5419: am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
* commit '827c5419fa8e68bd0d7807e1799344e7760f1363':
  Added an introduction to the fingerprint enrollment
2015-06-12 22:29:20 +00:00
Selim Cinek
ee5db351ac Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 2015-06-12 21:57:45 +00:00
Selim Cinek
ec8500438c Added an introduction to the fingerprint enrollment
Bug: 21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
2015-06-11 19:02:26 -07:00
Jorim Jaggi
79b49eb347 am e750927c: am 258e709a: am fb535a8e: Merge "Refine fingerprint enrollment experience" into mnc-dev
* commit 'e750927c70a45b163b612d21ecdb546d46324fed':
  Refine fingerprint enrollment experience
  Fix crash in battery screen
2015-06-11 23:14:46 +00:00
Jorim Jaggi
fb535a8e49 Merge "Refine fingerprint enrollment experience" into mnc-dev 2015-06-11 22:34:53 +00:00
Sanket Padawe
d97e804892 am 229708a3: am 1bcef2d1: am e27e3bcf: Merge "String changes for Cellular data toggle summary." into mnc-dev
* commit '229708a3949595d900ebdb201bf5daae104dd7f6':
  String changes for Cellular data toggle summary.
2015-06-11 22:28:48 +00:00
Sanket Padawe
42c0a174fe am 4acd0048: am c0d30052: am 9d7971a9: Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev
* commit '4acd0048e7a10340347be11aa62d77abb7e53145':
  String changes for PBAP chekcbox in BT pairing dialog.
2015-06-11 22:28:46 +00:00
Jorim Jaggi
436e02c3d5 Refine fingerprint enrollment experience
- Flash fingerprint graphic when enrollment progresses
- Show hint message when not progressing for a few seconds
- Make sure animation is always working

Bug: 21617091
Bug: 21644138
Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
2015-06-11 15:13:56 -07:00
Jason Monk
bdef599b1d am 1c4dcb03: am 02424dea: am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev
* commit '1c4dcb0315f8a6b5031327af668a6284304d6e88':
  Clean up settings shortcuts
2015-06-11 21:34:04 +00:00
Sanket Padawe
e27e3bcf9e Merge "String changes for Cellular data toggle summary." into mnc-dev 2015-06-11 21:31:35 +00:00
Sanket Padawe
9d7971a9e2 Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev 2015-06-11 21:29:31 +00:00
Sanket Padawe
0d9e167b07 String changes for PBAP chekcbox in BT pairing dialog.
Bug: 20488109
Change-Id: I922477c94cbf9c4042d8a895eb10a41da2783f14
2015-06-11 13:37:55 -07:00
Sanket Padawe
77e9570b2b String changes for Cellular data toggle summary.
Bug: 17073752
Change-Id: I61974ab3b2b2136aa5eb5027fc826d635a705ed1
2015-06-11 13:31:39 -07:00
Jason Monk
0011604fd1 Merge "Clean up settings shortcuts" into mnc-dev 2015-06-11 19:56:50 +00:00
Jason Monk
2acff556c2 Clean up settings shortcuts
- Remove some bad entries
 - Fix icons to be top-level item specific
 - Add memory

Bug: 20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
2015-06-11 15:47:29 -04:00
Jeff Sharkey
42ef2461b9 am b06835d1: am fae37744: am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev
* commit 'b06835d19eb5d2e416cf85604746388a754c42e9':
  Slow dialog string has no limit.
2015-06-11 17:09:30 +00:00
Lorenzo Colitti
fbc3f62e7e am 25566a38: am aab0a778: am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev
* commit '25566a38ce9c6f2fb32745c9ece82528b5c30478':
  Add a string for switching to cell when Wi-Fi loses backhaul.
2015-06-11 17:07:47 +00:00
Jeff Sharkey
0f6b243d4b Merge "Slow dialog string has no limit." into mnc-dev 2015-06-11 16:20:23 +00:00
Jeff Sharkey
9b0d09914b Slow dialog string has no limit.
Bug: 21342398
Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
2015-06-11 09:18:00 -07:00
Selim Cinek
38b48086bc am a9f19dea: am 01dc50f5: am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev
* commit 'a9f19dea4472a76d7c6ec280ff1a0da6a7e64c0e':
  Added setting strings for new fingerprint introduction screen
2015-06-11 05:56:19 +00:00
Jeff Sharkey
59adbd9027 am 72723306: am d10261eb: am 3803d91a: New strings!
* commit '72723306a18b4148240e98bff8cb0f78004d76e7':
  New strings!
2015-06-11 05:56:16 +00:00
Lajos Molnar
8f45270634 am 204f4068: am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
* commit '204f4068f78af61f3de289e0efa458dde6a0d6b7':
  developer settings: remove "Use deprecated AwesomePlayer" settings
2015-06-11 05:56:14 +00:00
Jorim Jaggi
7cc5b911fc am 6dd8e039: am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
* commit '6dd8e039da5a207052173e13a199153e8fb6dea9':
  Animations/success state for external confirm device credentials (2/2)
2015-06-11 05:56:12 +00:00
Lorenzo Colitti
1fdbbffced Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 2015-06-11 03:06:48 +00:00
Jason Monk
19291d5a89 am efb955f3: am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning
* commit 'efb955f3f5689062da6e326c6277e1a3758d5436':
  Add string for profile owner usage access warning
2015-06-11 01:34:06 +00:00
Jeff Brown
56dd84cb61 am c568dab6: am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
* commit 'c568dab675e3024c64f9be47f7831181b8889d20':
  Add simulated 4K display modes.
2015-06-11 01:34:05 +00:00
Selim Cinek
ff702a29ab Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 2015-06-11 01:10:50 +00:00
Selim Cinek
1a2c1ca4e9 Added setting strings for new fingerprint introduction screen
Bug: 21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
2015-06-10 18:08:16 -07:00
Jeff Sharkey
3803d91abb New strings!
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
2015-06-10 16:47:52 -07:00
Lajos Molnar
63504d8326 Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 2015-06-10 23:23:49 +00:00
Jorim Jaggi
ed76e59e49 Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 2015-06-10 23:10:08 +00:00
Jorim Jaggi
ff41a9a5a6 Animations/success state for external confirm device credentials (2/2)
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297 developer settings: remove "Use deprecated AwesomePlayer" settings
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
2015-06-10 15:00:13 -07:00
Paul Crowley
6904e5fa9c Add ellipsis to "Starting Android".
Bug: 20518822
Change-Id: I04f8380ca585680901a65b0741456f5ff44b3c0a
2015-06-10 22:25:46 +01:00
Jason Monk
f8d131e181 Add string for profile owner usage access warning
Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
2015-06-10 15:29:22 -04:00
Jeff Brown
f8f9088a6d Merge "Add simulated 4K display modes." into mnc-dev 2015-06-10 19:21:15 +00:00
Xiyuan Xia
beba0efa14 am 67b438b1: am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev
* commit '67b438b1185f6d11712ee9c962066c1651479507':
  Implement default assist app setting
2015-06-10 17:47:59 +00:00
Makoto Onuki
b5fcfcafac am 2f951024: am c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev
* commit '2f951024e40b9bc2662aa5ef53a4544f769999e9':
  Show list of permissions instead of just numbers
2015-06-10 17:21:00 +00:00
Lorenzo Colitti
335afcbb6c am 24f48299: am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev
* commit '24f4829994e047b1674fdf66c1dad51bcaf900d7':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
2015-06-10 17:13:29 +00:00
Jason Monk
b73d3a1811 am 68da427f: am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries
* commit '68da427f481f24c8c0f571f7915620f7c83c6912':
  Remove periods from ignore optimizations summaries
2015-06-10 17:13:01 +00:00
Jason Monk
ef2dadb7f8 am 6dc33a5a: am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev
* commit '6dc33a5ac7a2352be62b75edf1afc399821b38af':
  Advanced apps updates (2/2)
2015-06-10 17:13:00 +00:00
Jason Monk
f0f128c72a am 83fde1b0: am 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev
* commit '83fde1b0336a62193282dc27767c07fb6a71a8fb':
  Add sd card string, just in case
2015-06-10 17:12:58 +00:00
Xiyuan Xia
9823f27936 Merge "Implement default assist app setting" into mnc-dev 2015-06-10 17:08:44 +00:00
Makoto Onuki
0bd18745cf Merge "Show list of permissions instead of just numbers" into mnc-dev 2015-06-10 16:39:07 +00:00
Xiyuan Xia
86a554091d Implement default assist app setting
- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
  based on AppListPreferenceWithSettings;

Bug:20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
2015-06-10 08:43:28 -07:00
Lorenzo Colitti
275e6f7520 Merge changes from topic 'no-internet-notification' into mnc-dev
* changes:
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.
2015-06-10 15:25:27 +00:00