Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,309 Commits 1 Branch 0 Tags
4ff981c536f199d43a4e843d006ab1be3acbf2aa
Commit Graph

7082 Commits

Author SHA1 Message Date
John Spurlock
7daab48484 am f2903eda: am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 
* commit 'f2903edadcc785135fb07a26655bf80476da35ab':
  Settings: Remove unreachable "Battery Info" screen.
 2015-06-15 20:14:24 +00:00
John Spurlock
f2903edadc am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 
* commit '3fdfabcd4576b27c37608656c277686d73833b57':
  Settings: Remove unreachable "Battery Info" screen.
 2015-06-15 20:01:55 +00:00
John Spurlock
3fdfabcd45 am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 
* commit 'dddd589d8f0de00c192022ea9bd87f32a734343b':
  Settings: Remove unreachable "Battery Info" screen.
 2015-06-15 19:49:30 +00:00
John Spurlock
dddd589d8f Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 2015-06-15 19:36:46 +00:00
John Spurlock
dae8c154f0 Settings: Remove unreachable "Battery Info" screen. 
Bug: 21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
 2015-06-15 15:24:16 -04:00
Geoff Mendal
f4d7bd4f49 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 15:36:59 +00:00
Jason Monk
b7d220581e am d6e65040: am dfe186f5: am 49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev 
* commit 'd6e65040f5030a5b2c3db29ca5f5f8735fcdecec':
  Fix bad theming on owner-info
 2015-06-15 15:36:21 +00:00
Jason Monk
3946f18abd 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
 2015-06-15 15:24:58 +00:00
Jason Monk
d6e65040f5 am dfe186f5: am 49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev 
* commit 'dfe186f57c4f8cc04ca3b179e3dcae6d6c76fbc0':
  Fix bad theming on owner-info
 2015-06-15 15:24:53 +00:00
Jason Monk
89a770fb3b 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
 2015-06-15 15:12:48 +00:00
Jason Monk
dfe186f57c am 49ecfcd6: Merge "Fix bad theming on owner-info" into mnc-dev 
* commit '49ecfcd690a73112024df188924892772408d170':
  Fix bad theming on owner-info
 2015-06-15 15:11:59 +00:00
Jason Monk
49ecfcd690 Merge "Fix bad theming on owner-info" into mnc-dev 2015-06-15 15:05:34 +00:00
Jason Monk
39eee0c55c Fix bad theming on owner-info 
Bug: 21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
 2015-06-15 15:05:11 +00:00
Jason Monk
f7b0dfd6ae 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
 2015-06-15 15:00:20 +00:00
Geoff Mendal
b59e4e4df4 Import translations. DO NOT MERGE 
Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44
Auto-generated-cl: translation import
 2015-06-15 07:57:05 -07:00
Jason Monk
6b4a31c219 Don't auto-focus text fields in hotspot dialog 
Instead focus the parent, so that the fields can be seen on smaller
screens before editing.

Bug: 19095568
Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
 2015-06-15 10:45:46 -04:00
Geoff Mendal
d0ee913a5c Import translations. DO NOT MERGE 
Change-Id: Idb22432cce54225e2d9f02976473953daa7db514
Auto-generated-cl: translation import
 2015-06-15 07:26:30 -07:00
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
a864e46b47 am 20a0da89: am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev 
* commit '20a0da89089984b12805b707c8644bb4413389c4':
  Fix bad USB configuration under Developer Options
 2015-06-13 03:31:18 +00:00
Nick Kralevich
20a0da8908 am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev 
* commit '64a8032f44da51d0422cb52af4631c7ae2545731':
  Fix bad USB configuration under Developer Options
 2015-06-13 03:19:36 +00:00
Nick Kralevich
64a8032f44 Merge "Fix bad USB configuration under Developer Options" into mnc-dev 2015-06-13 03:12:08 +00: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
827c5419fa am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 
* commit '0abc4fb6e3c055e4107edd5a32466b4f4c90a7a8':
  Added an introduction to the fingerprint enrollment
 2015-06-12 22:22:27 +00:00
Selim Cinek
0abc4fb6e3 am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 
* commit 'ee5db351ac773f42d2fb2674545b82d1d1d0cdd5':
  Added an introduction to the fingerprint enrollment
 2015-06-12 22:11:56 +00:00
Selim Cinek
ee5db351ac Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 2015-06-12 21:57:45 +00:00
Makoto Onuki
4f33dc0416 am 0b5b05e2: am 20468a11: am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev 
* commit '0b5b05e2f5883868aea2d8bb36ef1c95d643722d':
  Promote "add service" from menu to list item
 2015-06-12 16:55:19 +00:00
Makoto Onuki
0b5b05e2f5 am 20468a11: am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev 
* commit '20468a1160eef269b7116535128daeedfbb7811a':
  Promote "add service" from menu to list item
 2015-06-12 16:40:31 +00:00
Makoto Onuki
20468a1160 am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev 
* commit 'e0142a67fd5f3dc52c82fed05d89735ad6a42aeb':
  Promote "add service" from menu to list item
 2015-06-12 16:28:30 +00:00
Makoto Onuki
e0142a67fd Merge "Promote "add service" from menu to list item" into mnc-dev 2015-06-12 16:18:31 +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
Adrian Roos
66fe739aa4 am b52435a9: am 593c1845: am da6e4c47: Merge "Ensure text is visible when choosing pattern" into mnc-dev 
* commit 'b52435a96309c40e73560a8fa8a15a4064f836be':
  Ensure text is visible when choosing pattern
 2015-06-12 01:10:02 +00:00
Adrian Roos
b52435a963 am 593c1845: am da6e4c47: Merge "Ensure text is visible when choosing pattern" into mnc-dev 
* commit '593c184584944aed230889a0e736ac484c435683':
  Ensure text is visible when choosing pattern
 2015-06-12 00:52:07 +00:00
Adrian Roos
593c184584 am da6e4c47: Merge "Ensure text is visible when choosing pattern" into mnc-dev 
* commit 'da6e4c47aa0e4319ada376d2917aafb2c2c27734':
  Ensure text is visible when choosing pattern
 2015-06-12 00:39:30 +00:00
Adrian Roos
da6e4c47aa Merge "Ensure text is visible when choosing pattern" into mnc-dev 2015-06-12 00:26:07 +00: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
Adrian Roos
ed427af748 Ensure text is visible when choosing pattern 
Bug: 21639578
Change-Id: Ib948411b3087c752a36ed6f853915e59946c0988
 2015-06-11 16:14:40 -07:00
Jorim Jaggi
e750927c70 am 258e709a: am fb535a8e: Merge "Refine fingerprint enrollment experience" into mnc-dev 
* commit '258e709a32ce69c906bea9e13e999d52e8ff5b32':
  Refine fingerprint enrollment experience
  Fix crash in battery screen
 2015-06-11 23:05:50 +00:00
Jorim Jaggi
258e709a32 am fb535a8e: Merge "Refine fingerprint enrollment experience" into mnc-dev 
* commit 'fb535a8e497d2e4ea068bb99760b11d3a1b6abf5':
  Refine fingerprint enrollment experience
  Fix crash in battery screen
 2015-06-11 22:48:51 +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
Sanket Padawe
229708a394 am 1bcef2d1: am e27e3bcf: Merge "String changes for Cellular data toggle summary." into mnc-dev 
* commit '1bcef2d1d4e510a5ea7bf1f48aa713b08f732719':
  String changes for Cellular data toggle summary.
 2015-06-11 22:17:21 +00:00
Sanket Padawe
4acd0048e7 am c0d30052: am 9d7971a9: Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev 
* commit 'c0d3005232e9a9d4745cf51838af5e60a36d13dc':
  String changes for PBAP chekcbox in BT pairing dialog.
 2015-06-11 22:17:20 +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
Sanket Padawe
1bcef2d1d4 am e27e3bcf: Merge "String changes for Cellular data toggle summary." into mnc-dev 
* commit 'e27e3bcf9efcc605e56de7c0257c6a02527601a0':
  String changes for Cellular data toggle summary.
 2015-06-11 21:54:52 +00:00
Sanket Padawe
c0d3005232 am 9d7971a9: Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev 
* commit '9d7971a9e2f069c200864bac86173de6276b6da8':
  String changes for PBAP chekcbox in BT pairing dialog.
 2015-06-11 21:54:50 +00: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