PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,768 Commits 1 Branch 0 Tags
e4af992fef82ab26670db5adc7957b4385baa86c
Commit Graph

20768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
0f24766c9a am cfd4b754: am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev 
* commit 'cfd4b754886534418d378d4065200c14844f2b09':
  Don't clear data summary when loader is cancelled
 2015-07-09 19:25:22 +00:00
Jason Monk
f2a3b6a05d am e60ad922: am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit 'e60ad922de334286cfd36c7f3939d34096e69049':
  Fix rotation issues
 2015-07-09 19:25:19 +00:00
Julia Reynolds
df778e8e76 am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev 
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
  Talkback improvements for Settings screens.
 2015-07-09 19:09:25 +00:00
Jason Monk
cfd4b75488 am 5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev 
* commit '5c3b7c3adefe27bf0a91eba8318048b677d276eb':
  Don't clear data summary when loader is cancelled
 2015-07-09 19:09:23 +00:00
Jason Monk
e60ad922de am b6b85325: Merge "Fix rotation issues" into mnc-dev 
* commit 'b6b85325e91a3e22dd23d67241adecc359dc0952':
  Fix rotation issues
 2015-07-09 19:09:21 +00:00
Julia Reynolds
963e3fdd05 Merge "Talkback improvements for Settings screens." into mnc-dev 2015-07-09 18:57:24 +00:00
Jason Monk
5c3b7c3ade Merge "Don't clear data summary when loader is cancelled" into mnc-dev 2015-07-09 18:55:09 +00:00
Jason Monk
b6b85325e9 Merge "Fix rotation issues" into mnc-dev 2015-07-09 18:55:03 +00:00
Zoltan Szatmary-Ban
64f55c4ffb am 381adf9e: am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev 
* commit '381adf9ea9b10e96cd0a13bee98fc26ba4566a4d':
  Check signature match between Cert installer and Settings
 2015-07-09 18:00:03 +00:00
Zoltan Szatmary-Ban
381adf9ea9 am ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev 
* commit 'ee77eced69fac3e6f94cbb3ce2013d8334c17c90':
  Check signature match between Cert installer and Settings
 2015-07-09 17:49:56 +00:00
Zoltan Szatmary-Ban
ee77eced69 Merge "Check signature match between Cert installer and Settings" into mnc-dev 2015-07-09 17:33:23 +00:00
Julia Reynolds
ce25af4838 Talkback improvements for Settings screens. 
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
 2015-07-09 13:21:20 -04:00
Zoltan Szatmary-Ban
307e3d048d Check signature match between Cert installer and Settings 
To prevent an app masquerading as com.android.certinstaller install
malicious certs.

Bug: 22095968
Change-Id: Ia79f326af0f39a23b687cb08981920665669e0a1
 2015-07-09 18:16:27 +01:00
Zoltan Szatmary-Ban
b82542122e am 325ba385: am 4bbe3d1f: Update all shown preferences in Settings > Storage 
* commit '325ba38595f079a09a5c5fe4a18e35ad6dd24ee5':
  Update all shown preferences in Settings > Storage
 2015-07-09 15:27:39 +00:00
Jason Monk
e950b54fcd Don't clear data summary when loader is cancelled 
Keep whatever summary we had before.

Bug: 22351861
Change-Id: Id2088404f09dcadce1cbf2959918956844d613a7
 2015-07-09 11:22:26 -04:00
Zoltan Szatmary-Ban
325ba38595 am 4bbe3d1f: Update all shown preferences in Settings > Storage 
* commit '4bbe3d1fb66a99bfdf4cad8f2e77df23dccebbbd':
  Update all shown preferences in Settings > Storage
 2015-07-09 15:14:32 +00:00
Zoltan Szatmary-Ban
4bbe3d1fb6 Update all shown preferences in Settings > Storage 
This is achieved by iterating through the pool of StorageItemPreferences up
to the index of the last shown one, instead of iterating through the
preferences of the screen which may miss preferences inside other top-level
preference groups.

Bug: 22353561
Change-Id: I2293a7949a5becfb506d6b7965f8db2f11845756
 2015-07-09 15:37:26 +01:00
Jason Monk
b573a1659d Fix rotation issues 
Bug: 22373905
Bug: 22311581
Change-Id: Idbed99a3fc0cc64047da151be166ee0ea4c1fb3d
 2015-07-09 10:33:58 -04:00
Sasha Levitskiy
2e97520ec0 am 49abf5f4: am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '49abf5f4cb9d363246659f9320a3bfb99288adfa':
  Fingerprint: Add post enroll call
 2015-07-08 23:46:02 +00:00
Tim Kilbourn
8170e7a49b am 5ffa7c26: am 49983b99: Show correct text for app link domains. 
* commit '5ffa7c260f34ead64572b05b501bde0d194fef81':
  Show correct text for app link domains.
 2015-07-08 23:46:00 +00:00
Sasha Levitskiy
49abf5f4cb am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '93b1a5a974f723f5aa463162b1f5aa43338f8c2e':
  Fingerprint: Add post enroll call
 2015-07-08 23:37:33 +00:00
Tim Kilbourn
5ffa7c260f am 49983b99: Show correct text for app link domains. 
* commit '49983b991c01af0bc958eee1ddad144b7bde44ec':
  Show correct text for app link domains.
 2015-07-08 23:37:32 +00:00
Sasha Levitskiy
93b1a5a974 Merge "Fingerprint: Add post enroll call" into mnc-dev 2015-07-08 23:34:26 +00:00
Selim Cinek
babeeacb58 am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 
* commit 'aab3a4c84715ecb4c95b60081badd225202723df':
  Fixed the layout for the fingerprint renaming
 2015-07-08 23:22:58 +00:00
Selim Cinek
aab3a4c847 Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 2015-07-08 23:09:52 +00:00
Sasha Levitskiy
0e0cff3261 Fingerprint: Add post enroll call 
Bug 22007124

Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-07-08 16:03:11 -07:00
Selim Cinek
abd67de1ad Fixed the layout for the fingerprint renaming 
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
 2015-07-08 15:47:56 -07:00
Tim Kilbourn
49983b991c Show correct text for app link domains. 
The user's preferences were not queried on the app listing, making it
look like an app would open links even after the user disabled app
links for the app.

Bug: 21093152
Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095
 2015-07-08 15:43:43 -07:00
Jorim Jaggi
221f3771aa am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '3b517b68057857a2b2552dd09e520907c809f15a':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:22:13 +00:00
Jeff Sharkey
22f664084d am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '68fdb73d0cb2e354063ff5e37349d942923e379e':
  Move storage when formatting primary disk.
 2015-07-08 22:22:11 +00:00
Jorim Jaggi
3b517b6805 am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit 'b493b2910190b95bba6cad0f328a0339acebef9b':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:08:34 +00:00
Jeff Sharkey
68fdb73d0c am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '80eba76b109efa7e48eaf7aac145e05938d4405e':
  Move storage when formatting primary disk.
 2015-07-08 22:08:32 +00:00
Jorim Jaggi
b493b29101 Merge "Hide screenshot preference when assist is disabled" into mnc-dev 2015-07-08 21:59:01 +00:00
Jeff Sharkey
80eba76b10 Merge "Move storage when formatting primary disk." into mnc-dev 2015-07-08 21:55:44 +00:00
Amit Mahajan
0757812525 am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '2856c4fcbd4d4453245f4ed0aa7bb1bc02b2bd14':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 20:53:35 +00:00
Sanket Padawe
beb277de3c am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'a63ee14f45f22f87d2d112ee9e5686e91e9fedc7':
  Locale based string changes in BT.
 2015-07-08 20:53:32 +00:00
Sanket Padawe
3dfe8963e6 am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit 'f7a64d206869ef783820f08966ad3bbf8ebe4559':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 20:53:31 +00:00
Amit Mahajan
2856c4fcbd am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 20:37:19 +00:00
Sanket Padawe
a63ee14f45 am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
  Locale based string changes in BT.
 2015-07-08 20:37:18 +00:00
Sanket Padawe
f7a64d2068 am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit 'c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 20:37:16 +00:00
Jorim Jaggi
56db978c2a Hide screenshot preference when assist is disabled 
Bug: 22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
 2015-07-08 13:32:12 -07:00
Amit Mahajan
01ce80b574 Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev 2015-07-08 20:24:10 +00:00
Amit Mahajan
3cd87a2f70 Remove 'do not translate' comment for string 'None'. 
Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
 2015-07-08 11:07:34 -07:00
Sanket Padawe
c7777b9470 Merge "Locale based string changes in BT." into mnc-dev 2015-07-08 17:15:57 +00:00
Sanket Padawe
c9cdf9c814 Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev 2015-07-08 17:14:55 +00:00
Robin Lee
d81d249af4 am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit 'e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
  Restore Vpn advanced options on re-init or rotate
 2015-07-08 16:40:44 +00:00
Robin Lee
e46e48271a am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit '64e1e15d10b41f6993abf4cb77d220a05f79191a':
  Restore Vpn advanced options on re-init or rotate
 2015-07-08 16:27:42 +00:00
Robin Lee
64e1e15d10 Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 2015-07-08 16:17:23 +00:00
Geoff Mendal
d0249808fd am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '661dbf01b7ba8cfdb1ab9d1a5dd2054c640fa183':
  Import translations. DO NOT MERGE
 2015-07-08 16:06:29 +00:00
Geoff Mendal
661dbf01b7 am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4a332ee8ed15c991e29e46490d2a9d93117bca26':
  Import translations. DO NOT MERGE
 2015-07-08 15:50:58 +00:00