Commit Graph

8347 Commits

Author SHA1 Message Date
Jason Monk
ff24d5d941 am 969b5842: am 49ad08e2: am 1ecfc645: Merge "Fix crash while rotating with app info dialog up" into mnc-dev
* commit '969b58420fbe5620a367e134f9cc1b15aa773365':
  Fix crash while rotating with app info dialog up
2015-05-26 19:55:20 +00:00
Jason Monk
969b58420f am 49ad08e2: am 1ecfc645: Merge "Fix crash while rotating with app info dialog up" into mnc-dev
* commit '49ad08e20fda90f03bb89ba395a6d14d00406a25':
  Fix crash while rotating with app info dialog up
2015-05-26 19:42:10 +00:00
Jason Monk
1ecfc645ee Merge "Fix crash while rotating with app info dialog up" into mnc-dev 2015-05-26 19:22:18 +00:00
Sanket Padawe
6c30d05691 am 9c62ddec: am 86dbdff1: am 6d9500d0: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
* commit '9c62ddeca6de29eb6cfd2129cbe69c41046c5bdb':
  Fix generation of pin for WPS on screen rotation.
2015-05-26 19:17:16 +00:00
Jason Monk
5e2529aeb4 Fix crash while rotating with app info dialog up
Bug: 21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0
2015-05-26 15:12:18 -04:00
Sanket Padawe
9c62ddeca6 am 86dbdff1: am 6d9500d0: Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev
* commit '86dbdff1fa203b415929fb6c65fa431d56e7eaa8':
  Fix generation of pin for WPS on screen rotation.
2015-05-26 19:09:29 +00:00
Sanket Padawe
6d9500d04c Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev 2015-05-26 18:46:04 +00:00
Jason Monk
e224c39795 am 1737c2e5: am 5b1c0329: am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev
* commit '1737c2e5ef093a4db2ec1ede8ad523e62ce1f61f':
  Unbanish memory screen and new UX
2015-05-26 17:28:16 +00:00
Jason Monk
1737c2e5ef am 5b1c0329: am 7231147b: Merge "Unbanish memory screen and new UX" into mnc-dev
* commit '5b1c03293c5e0914f773644b2958d321dc83afbe':
  Unbanish memory screen and new UX
2015-05-26 17:13:47 +00:00
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
7231147b56 Merge "Unbanish memory screen and new UX" into mnc-dev 2015-05-26 16:55:42 +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
beb171d2e5 Unbanish memory screen and new UX
Give memory screen a makeover so that it looks nice enough to be
restored to its rightful home.

Bug: 20694769
Change-Id: I2f6933037b3fbbfb0d9fe5e3ca821ef59e171faa
2015-05-26 11:41:37 -04: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
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
Sean Francis-Lyon
389cf34380 Merge "DO NOT MERGE show correct backup status" into mnc-dev 2015-05-22 20:38:41 +00: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
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
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
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
Jason Monk
df283601c5 Banish Theme setting to developer options
Bug: 21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
2015-05-21 16:46:24 -04:00
Jason Monk
7c1453cd25 am 837dfca0: am ce6f1651: Merge "Fix loading screen one more time" into mnc-dev
* commit '837dfca0fa82340788846e785f07b0f9a3d9df29':
  Fix loading screen one more time
2015-05-21 20:38:12 +00:00
Jason Monk
ce6f165104 Merge "Fix loading screen one more time" into mnc-dev 2015-05-21 20:13:37 +00:00
Jason Monk
74ecb1f211 Fix loading screen one more time
Don't rebuild the app list until the entry load is complete to avoid
having a slowly populating list shown to the user.

Bug: 21086054
Change-Id: I801ab292fdbf6801c1b9c8f957336660810da5f6
2015-05-21 16:09:41 -04:00
Xiyuan Xia
e383bc2248 am 491a6b13: am a0e052b1: Merge "Do not show soft keyboard when locked out" into mnc-dev
* commit '491a6b13892b6ddc9271ad063ea8b4773b08b924':
  Do not show soft keyboard when locked out
2015-05-21 18:48:03 +00:00
Jason Monk
8289996dfb am 939ee559: am b2e07cd0: Merge "Remove data item from app info when not supported" into mnc-dev
* commit '939ee55954b5f8cd4328de8b761385321f2fd773':
  Remove data item from app info when not supported
2015-05-21 18:43:22 +00:00
Xiyuan Xia
a0e052b17b Merge "Do not show soft keyboard when locked out" into mnc-dev 2015-05-21 16:16:07 +00:00
Jason Monk
b2e07cd0f9 Merge "Remove data item from app info when not supported" into mnc-dev 2015-05-21 12:55:31 +00:00
Jason Monk
b45e27bc0f Remove data item from app info when not supported
Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea
2015-05-21 08:43:25 -04:00
Xiyuan Xia
4a8edaf8b0 Do not show soft keyboard when locked out
- Remove stateVisible for ConfirmLockPassword activity so that
  soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
  activity window gains focus;

Bug:20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a
2015-05-20 14:43:36 -07:00
Jorim Jaggi
4d1e3862c2 am 84caa256: am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
* commit '84caa2569722b2ee8234c9a6856a32e148f54463':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
2015-05-20 19:25:47 +00:00
Jorim Jaggi
b56a10368f Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 2015-05-20 19:01:50 +00:00
Lorenzo Colitti
39a67fd5cf am 8f4bf867: am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev
* commit '8f4bf8677c022fe7368ba4c9a96ac9e8de778a70':
  Address TODOs in WifiNoInternetDialog.
2015-05-20 09:56:41 +00:00
Lorenzo Colitti
f675409e23 Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 2015-05-20 08:04:43 +00:00
Maurice Lam
7a2eae76fc am 12bbde91: am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
* commit '12bbde919befdf7d0700e951da5bf334cc248ecd':
  [LockScreen] Update initial string in choose lock screens
2015-05-20 02:00:01 +00:00
Maurice Lam
efbe46612d Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev 2015-05-20 01:42:42 +00:00
Maurice Lam
163dee9fb7 [LockScreen] Update initial string in choose lock screens
In choose password and PIN screens, change the initial string from
duplicate of the title ("Choose your password/PIN") to the
verification string ("PIN must be at least ? digits" / "Password must
be at least ? characters").

Bug: 20948877
Change-Id: I635ec625f2820e522cdfc983e13ee71706e7004e
2015-05-19 17:27:12 -07:00
Fyodor Kupolov
eecff41cfc am dc774b61: am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev
* commit 'dc774b618bf8f0ce30b50fe2f4bb0972308a34f7':
  Added SearchIndexProvider for UserSettings
2015-05-19 22:52:06 +00:00
Jeff Sharkey
1ccf44418e am 719d0ad9: am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev
* commit '719d0ad90479fc84d0dad1a8fa539b7fee4da746':
  Warn user when adopted device is slow.
2015-05-19 22:51:15 +00:00
Xiyuan Xia
a61ad9e5e5 am 0fa945f0: am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev
* commit '0fa945f099364ff05e42899a1da989b12da0a043':
  No input instead of disabling password/pin entry
2015-05-19 22:51:07 +00:00
Guang Zhu
7375f0df89 am b340980d: am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev
* commit 'b340980deea8a6948d4e8a602557b5721d45a662':
  Monkey should not be allowed to switch USB mode
2015-05-19 22:50:48 +00:00
Jason Monk
070b24ade2 am 0a42a67d: am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev
* commit '0a42a67d4e27fe5b144e2fd41efb8cc273ec63eb':
  Default ignore optimizations to show system apps
2015-05-19 22:50:34 +00:00
Fyodor Kupolov
c80084e55a Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 2015-05-19 21:44:17 +00:00