Commit Graph

20566 Commits

Author SHA1 Message Date
Jason Monk
05ce384b62 am 28d03835: am 3f058ca1: am e9866b6d: Add permission summaries back in
* commit '28d03835abd1cccaa958c9832063103b3e8d8d3c':
  Add permission summaries back in
2015-05-26 17:06:02 +00:00
Jason Monk
28d03835ab am 3f058ca1: am e9866b6d: Add permission summaries back in
* commit '3f058ca1c8f1a03b8c476c2e87163682f8c266d6':
  Add permission summaries back in
2015-05-26 16:53:30 +00:00
Jason Monk
3f058ca1c8 am e9866b6d: Add permission summaries back in
* commit 'e9866b6dc47201630c057f946423d572b8c46af8':
  Add permission summaries back in
2015-05-26 16:41:42 +00:00
Jason Monk
e9866b6dc4 Add permission summaries back in
Use broadcasts to ask the PackageInstaller about the number of
granted permissions.

Bug: 21078474
Change-Id: I91d88d145a803f5f6c3f3163ba1f4500d39b1943
2015-05-26 10:28:21 -04:00
Geoff Mendal
a3fbdd94eb am 88cb413e: (-s ours) am eec23776: (-s ours) am 85a72a90: (-s ours) Import translations. DO NOT MERGE
* commit '88cb413ebe4108df05bc068444fe5c5db752f3ee':
  Import translations. DO NOT MERGE
2015-05-25 16:34:59 +00:00
Geoff Mendal
88cb413ebe am eec23776: (-s ours) am 85a72a90: (-s ours) Import translations. DO NOT MERGE
* commit 'eec237769a8af11dd5e2b2eaf40ae6f6c893661a':
  Import translations. DO NOT MERGE
2015-05-25 16:22:33 +00:00
Geoff Mendal
eec237769a am 85a72a90: (-s ours) Import translations. DO NOT MERGE
* commit '85a72a9088d6be0cd0fda03d0e80a24a8fcaa4cb':
  Import translations. DO NOT MERGE
2015-05-25 16:11:25 +00:00
Geoff Mendal
85a72a9088 Import translations. DO NOT MERGE
Change-Id: I60153a0868ea5ec670c3c3517ac032e616a1a0ef
Auto-generated-cl: translation import
2015-05-25 08:57:08 -07:00
Geoff Mendal
23d49e0c75 Import translations. DO NOT MERGE
Change-Id: I62198fa72a594fd159fcd25478468779ec62b3e0
Auto-generated-cl: translation import
2015-05-25 08:20:07 -07:00
Sean Francis-Lyon
8c106a3c57 am ab400026: (-s ours) am 19c39d27: am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev
* commit 'ab400026df3a4c84d193179f2d07b03405f205da':
  DO NOT MERGE show correct backup status
2015-05-22 22:23:43 +00:00
Sean Francis-Lyon
ab400026df am 19c39d27: am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev
* commit '19c39d275dcbe8453776185f5533ad50146c13ac':
  DO NOT MERGE show correct backup status
2015-05-22 22:09:40 +00:00
Maurice Lam
90d35bfaf9 am 73f865bf: am b2c02e27: am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
* commit '73f865bf8dc8eef9dd6daa15289fb3d389b8cf90':
  [WifiSetup] Align to mac address to locale start
2015-05-22 21:42:37 +00:00
Maurice Lam
2f019c6194 am 0640ad68: am db0e8b65: am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
* commit '0640ad681434e2e2efb183f6b59d08516fe9bdf8':
  [WifiSetup] Update phone illustrations
2015-05-22 21:42:35 +00:00
Jason Monk
cc6e9ae9c7 am 2821a373: am cf55da1e: am b2f11d01: String changes for app links in settings
* commit '2821a373edf50b054e8a68565dbec5a3774dbb56':
  String changes for app links in settings
2015-05-22 21:41:59 +00:00
Sean Francis-Lyon
19c39d275d am 389cf343: Merge "DO NOT MERGE show correct backup status" into mnc-dev
* commit '389cf343805c0d40af720a06ead6e92bdd512527':
  DO NOT MERGE show correct backup status
2015-05-22 20:51:50 +00:00
Sean Francis-Lyon
389cf34380 Merge "DO NOT MERGE show correct backup status" into mnc-dev 2015-05-22 20:38:41 +00:00
Maurice Lam
73f865bf8d am b2c02e27: am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
* commit 'b2c02e2709456ebdb10b55d9f97f5db1892e239e':
  [WifiSetup] Align to mac address to locale start
2015-05-22 19:48:05 +00:00
Maurice Lam
0640ad6814 am db0e8b65: am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
* commit 'db0e8b65e0a1e15521b93744512933197b32fba7':
  [WifiSetup] Update phone illustrations
2015-05-22 19:48:04 +00:00
Maurice Lam
b2c02e2709 am df8d8907: Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev
* commit 'df8d8907a867e4d93f42d0a305371124b4fd599d':
  [WifiSetup] Align to mac address to locale start
2015-05-22 19:35:30 +00:00
Maurice Lam
db0e8b65e0 am 6fdd06dc: Merge "[WifiSetup] Update phone illustrations" into mnc-dev
* commit '6fdd06dcfc82a246911b1b285b4b6e4f41d0b8fc':
  [WifiSetup] Update phone illustrations
2015-05-22 19:35:29 +00:00
Maurice Lam
df8d8907a8 Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev 2015-05-22 19:33:19 +00:00
Maurice Lam
6fdd06dcfc Merge "[WifiSetup] Update phone illustrations" into mnc-dev 2015-05-22 19:27:10 +00:00
Jason Monk
2821a373ed am cf55da1e: am b2f11d01: String changes for app links in settings
* commit 'cf55da1ef517e63a6903e0730683d938cfbcf05c':
  String changes for app links in settings
2015-05-22 19:11:52 +00:00
Maurice Lam
cd3fbba9b7 [WifiSetup] Align to mac address to locale start
Set the textDirection of the mac address view to "locale" instead of
the inherited default of "firstStrong", so that the address itself is
always aligned with the label.

Bug: 21396886
Change-Id: I143ec069bde56d34484e8839c60386de268bb930
2015-05-22 11:59:43 -07:00
Jason Monk
cf55da1ef5 am b2f11d01: String changes for app links in settings
* commit 'b2f11d013cc95ba9bebb62cdcbd06a3920872d24':
  String changes for app links in settings
2015-05-22 18:51:34 +00:00
Jason Monk
b2f11d013c String changes for app links in settings
Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4
2015-05-22 14:42:45 -04:00
Maurice Lam
65079b2d3c [WifiSetup] Update phone illustrations
Update illustrations in phone layout, to move the buildings up so
that they are not shown when the header is sticky.

Bug: 20954868
Change-Id: I3db4ac19901b5e5fdaeef3bdabe94e81e40b159c
2015-05-22 11:30:51 -07:00
Stuart Scott
176f512c5a Network Reset should have a lockdown like Factory Reset.
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
2015-05-22 10:19:53 -07:00
Jim Miller
cd2eb2e6c3 am e52c0152: am 549d5ec8: am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev
* commit 'e52c0152f8a8982fe02ffd3d7e2f2f9969167721':
  Fix crash in fingerprint settings.
2015-05-22 15:50:04 +00:00
Jim Miller
e52c0152f8 am 549d5ec8: am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev
* commit '549d5ec89ecc35a7d91fbd10f982788c135f520d':
  Fix crash in fingerprint settings.
2015-05-22 02:03:21 +00:00
Jim Miller
549d5ec89e am c499a5fe: Merge "Fix crash in fingerprint settings." into mnc-dev
* commit 'c499a5fe9d6632fa73104dcc88a9e2c2cd390dde':
  Fix crash in fingerprint settings.
2015-05-22 01:50:13 +00:00
Jim Miller
c499a5fe9d Merge "Fix crash in fingerprint settings." into mnc-dev 2015-05-22 01:42:27 +00:00
Jim Miller
622142ce9d Fix crash in fingerprint settings.
Fixes bug 21333219
Fixes bug 21336059

Change-Id: I3e5c9257affd10ace6b55f6d0b2ddbf3babf30f1
2015-05-21 18:40:02 -07:00
Dave Langemak
0f5a085391 am 0d98b2b7: am 1c1e85dc: am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev
* commit '0d98b2b7960be1a24937f80ff66ed5cad644e2f6':
  Banish Theme setting to developer options
2015-05-22 00:24:09 +00:00
Dave Langemak
0d98b2b796 am 1c1e85dc: am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev
* commit '1c1e85dc5f628c03f484fb51bf13253e7d10feb6':
  Banish Theme setting to developer options
2015-05-22 00:17:46 +00:00
Dave Langemak
1c1e85dc5f am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev
* commit 'ea9b3198b43ac7c67c9a4ff3e27bb133fd0c6293':
  Banish Theme setting to developer options
2015-05-22 00:06:18 +00:00
Dave Langemak
ea9b3198b4 Merge "Banish Theme setting to developer options" into mnc-dev 2015-05-21 23:56:25 +00:00
Sean Francis-Lyon
8452a62216 DO NOT MERGE show correct backup status
show correct backup status after dismissing are-you-sure dialog
for turnning off backup and restore in settings

Change-Id: I31c4106cab58f84b77568356188e5ce49ca3430b
(cherry picked from commit f833588dae)
2015-05-21 22:42:56 +00:00
Sean Francis-Lyon
3aa73f6aa5 Merge "show correct backup status after dismissing are-you-sure dialog for turnning off backup" 2015-05-21 22:39:17 +00:00
Maurice Lam
ee127ed133 am 21deee07: am 03d12996: am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
* commit '21deee07ee972066aeb0daf6f636618df23364e8':
  [LockScreenSetup] Move retry button to top
2015-05-21 22:33:32 +00:00
Maurice Lam
21deee07ee am 03d12996: am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
* commit '03d12996462136ab8df91a76f4b8bf77cd53baef':
  [LockScreenSetup] Move retry button to top
2015-05-21 22:22:07 +00:00
Sean Francis-Lyon
f833588dae show correct backup status after dismissing are-you-sure dialog for turnning off backup
Change-Id: I31c4106cab58f84b77568356188e5ce49ca3430b
2015-05-21 15:21:12 -07:00
Jorim Jaggi
ee96ed2613 am 6cbad01c: am c8f78ec9: am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev
* commit '6cbad01c0b0cd145cc531b813e4541885148b457':
  Fix string for fingerprint settings
2015-05-21 22:07:17 +00:00
Maurice Lam
03d1299646 am 51eec32a: Merge "[LockScreenSetup] Move retry button to top" into mnc-dev
* commit '51eec32afa0d4599b437b1823a2b42d44d9bf001':
  [LockScreenSetup] Move retry button to top
2015-05-21 22:06:29 +00:00
Maurice Lam
51eec32afa Merge "[LockScreenSetup] Move retry button to top" into mnc-dev 2015-05-21 21:55:48 +00:00
Jorim Jaggi
6cbad01c0b am c8f78ec9: am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev
* commit 'c8f78ec956ba6e59214926b3e442667575a6fc47':
  Fix string for fingerprint settings
2015-05-21 21:40:20 +00:00
Jorim Jaggi
c8f78ec956 am 19ea8b70: Merge "Fix string for fingerprint settings" into mnc-dev
* commit '19ea8b703455cf326e7c481e33e757ff0ddfed62':
  Fix string for fingerprint settings
2015-05-21 21:32:37 +00:00
Jorim Jaggi
19ea8b7034 Merge "Fix string for fingerprint settings" into mnc-dev 2015-05-21 21:23:57 +00:00
Jason Monk
b5d48a12d5 am 7c1453cd: am 837dfca0: am ce6f1651: Merge "Fix loading screen one more time" into mnc-dev
* commit '7c1453cd2520d6f50fa9114eb47808ec17893b5c':
  Fix loading screen one more time
2015-05-21 20:50:36 +00:00
Jason Monk
df283601c5 Banish Theme setting to developer options
Bug: 21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
2015-05-21 16:46:24 -04:00