Commit Graph

22502 Commits

Author SHA1 Message Date
Makoto Onuki
1d37d0f7fb Add simple null checks to StorageWizard*, also listen to...
the disk destroyed event.

Bug 21336042

Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
2015-06-12 16:28:18 -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
Rubin Xu
8b336e74b7 am 7d4f7abc: am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
* commit '7d4f7abc280f44e57d57b21b793bc4657f99bfa8':
  Defensively load untrusted icons from account authenticator
2015-06-12 16:55:18 +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
Rubin Xu
7d4f7abc28 am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
* commit '4c5eaae564f20e47e6c3a4f7906446b195c639da':
  Defensively load untrusted icons from account authenticator
2015-06-12 16:40:29 +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
Rubin Xu
4c5eaae564 am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
* commit '47d329f79af7ae74e6b840eb90c15b7cdc294b53':
  Defensively load untrusted icons from account authenticator
2015-06-12 16:28:29 +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
Rubin Xu
47d329f79a Merge "Defensively load untrusted icons from account authenticator" into mnc-dev 2015-06-12 16:18:16 +00:00
Kenny Guy
c7013f4dd6 am 6816994e: am a381632d: am dabba2f6: Merge "Remove incorrect TODO and meta-data." into mnc-dev
* commit '6816994e85c416f55cdc4621877a12749d2f6fcc':
  Remove incorrect TODO and meta-data.
2015-06-12 15:47:16 +00:00
Kenny Guy
6816994e85 am a381632d: am dabba2f6: Merge "Remove incorrect TODO and meta-data." into mnc-dev
* commit 'a381632db055eb7cf72a740fb8416315e562ba82':
  Remove incorrect TODO and meta-data.
2015-06-12 15:36:14 +00:00
Kenny Guy
a381632db0 am dabba2f6: Merge "Remove incorrect TODO and meta-data." into mnc-dev
* commit 'dabba2f6c41ae366c65c4667ee7be312eb96f39a':
  Remove incorrect TODO and meta-data.
2015-06-12 15:23:56 +00:00
Kenny Guy
dabba2f6c4 Merge "Remove incorrect TODO and meta-data." into mnc-dev 2015-06-12 15:11:28 +00:00
Kenny Guy
3edba861aa Remove incorrect TODO and meta-data.
SHOW_INPUT_METHOD_PICKER is only used to call into
the InputMethodManagerService which as its a system
service could handle calls from the managed profile
if it desired. Howwever profiles use input methods
from the parent user that shouldn't be needed.

Bug: 20934597
Change-Id: Id5df6eb693550ff200cbc12ed66de31323689af3
2015-06-12 15:45:19 +01: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
Amit Mahajan
9d4b548619 Change to trigger client initiated OMA-DM session on System update req.
Bug: 21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
2015-06-11 15:54:31 -07: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
Jeff Sharkey
cb830993df am a48e4fd9: am 41b7468f: am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev
* commit 'a48e4fd9ed1c5be5f58d572a015fda6b0fc34d26':
  Always round migration times up to 1 second.
2015-06-11 22:28:45 +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
Jeff Sharkey
a48e4fd9ed am 41b7468f: am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev
* commit '41b7468feb96ac51f494abc5414f7f02e801ed97':
  Always round migration times up to 1 second.
2015-06-11 22:17:19 +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
Jeff Sharkey
41b7468feb am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev
* commit 'f25fc9cb6798d04593c4fd28f8542a7884f66e5f':
  Always round migration times up to 1 second.
2015-06-11 21:54:17 +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
Makoto Onuki
0ec96fe64c Promote "add service" from menu to list item
Also show the app icon for each service.

Bug 19914125

Change-Id: I592c526746a3ec9f67e8e8a6c6f1530e7724e310
2015-06-11 14:26:29 -07:00
Jason Monk
1c4dcb0315 am 02424dea: am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev
* commit '02424dead1be6877d11bf30ba87e2b97dc9042d1':
  Clean up settings shortcuts
2015-06-11 21:11:02 +00:00
Jeff Sharkey
f25fc9cb67 Merge "Always round migration times up to 1 second." into mnc-dev 2015-06-11 20:45:09 +00:00
Jeff Sharkey
5693274d2a Always round migration times up to 1 second.
Bug: 21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
2015-06-11 13:43:56 -07: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
02424dead1 am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev
* commit '0011604fd1f03125b22550f359997cc4922dd8bb':
  Clean up settings shortcuts
2015-06-11 20:05:39 +00:00
Jason Monk
0011604fd1 Merge "Clean up settings shortcuts" into mnc-dev 2015-06-11 19:56:50 +00:00