Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,902 Commits 1 Branch 0 Tags
91f4d5490d0f9aa86015c565250b2f8d9e2d608b
Commit Graph

9106 Commits

Author SHA1 Message Date
Jorim Jaggi
6c4a29e5e8 am 72f141a5: am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev 
* commit '72f141a518426b53295f65836eebb7ecf4316c2d':
  Don't use screenshot if structure is disabled (2/2)
 2015-07-28 21:18:45 +00:00
Jorim Jaggi
a15cf22796 am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev 
* commit '22064d8b89dbe4feb79acff3606540f416bd00a0':
  Don't use screenshot if structure is disabled (2/2)
 2015-07-28 20:30:40 +00:00
Jorim Jaggi
4d9f5c91ae Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev 2015-07-28 19:49:43 +00:00
Jorim Jaggi
e32c17580e Don't use screenshot if structure is disabled (2/2) 
Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034
 2015-07-28 12:07:10 -07:00
Jorim Jaggi
e02213db6b am 401453eb: am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev 
* commit '401453eb9fbd9c914181acfe53a9a33f0350e848':
  Fix blank confirm device credential activity
 2015-07-28 01:33:30 +00:00
Jorim Jaggi
bcb0011dd9 am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev 
* commit 'afd5a84830ed2d3dbff2c0a47d92bd34ef398394':
  Fix blank confirm device credential activity
 2015-07-28 01:06:22 +00:00
Jorim Jaggi
dcf61a2dfa Merge "Fix blank confirm device credential activity" into mnc-dev 2015-07-28 00:36:00 +00:00
Jorim Jaggi
07d03c7b4b am 0b555932: am 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev 
* commit '0b55593283c4b919fac21e057ded15dbae17befd':
  Move PIN/Pattern appear animation to RenderThread (2/2)
 2015-07-27 19:56:34 +00:00
Jason Monk
0b942cc7c1 am 9be8c22f: am 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev 
* commit '9be8c22fbf2a639d0722c585479e496443e2b622':
  Battery summary - tint uid 0 icon
 2015-07-27 19:31:49 +00:00
Jorim Jaggi
33f430ea90 am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev 
* commit '935b4444160ca816a769faf509a2d6789e5e6651':
  Move PIN/Pattern appear animation to RenderThread (2/2)
 2015-07-27 19:30:29 +00:00
Jason Monk
436a8bbeb0 am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev 
* commit '3eb14e0383b15a379bd224cabdebe4e5d7366279':
  Battery summary - tint uid 0 icon
 2015-07-27 19:04:10 +00:00
Jorim Jaggi
58d1995c90 Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev 2015-07-27 18:55:30 +00:00
Jorim Jaggi
35d26096c0 Fix blank confirm device credential activity 
Make sure to play the enter animation only once, so it is guaranteed
that we get onEnterAnimationComplete.

Bug: 22677671
Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d
 2015-07-27 18:53:29 +00:00
Jason Monk
7412992651 am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev 
* commit 'ebefd240b6dd90a5ccc3da8f74cdc42e8c808ba7':
  Update battery optimization strings
 2015-07-27 18:47:32 +00:00
Sanket Padawe
98c03dd7d3 am 5babd58a: am f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev 
* commit '5babd58a516e7227652706e856e15a21743f70b1':
  Fix issues in AP dialog arising after clicking on AP preferences.
 2015-07-27 18:47:28 +00:00
Julia Reynolds
96789ed4cc am 1f980cb4: am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB. 
* commit '1f980cb430b7d15415953ecae35c149a22684730':
  Handle app uninstall via Storage & USB.
 2015-07-27 18:47:27 +00:00
Jason Monk
3b521b60d3 Merge "Battery summary - tint uid 0 icon" into mnc-dev 2015-07-27 18:36:10 +00:00
Jason Monk
f0b615de01 am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev 
* commit 'b322fdf5b80e9ace8a8a4623a2c7f996434ac4eb':
  Update battery optimization strings
 2015-07-27 18:19:09 +00:00
Sanket Padawe
f9a6c5bb2f am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev 
* commit '970881d912f29775bb4063678c98fa77d3186b9b':
  Fix issues in AP dialog arising after clicking on AP preferences.
 2015-07-27 18:19:07 +00:00
Julia Reynolds
82b938c4ae am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB. 
* commit '0c8bee9643717519c7d8ca7888068c7baf07b994':
  Handle app uninstall via Storage & USB.
 2015-07-27 18:19:06 +00:00
Jason Monk
08cb39837f Merge "Update battery optimization strings" into mnc-dev 2015-07-27 17:39:54 +00:00
Sanket Padawe
ca25825152 Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev 2015-07-27 17:31:42 +00:00
Jason Monk
5ef0a9e826 Battery summary - tint uid 0 icon 
Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b
 2015-07-27 13:03:42 -04:00
Jason Monk
c9eba1f253 Update battery optimization strings 
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
 2015-07-27 12:29:25 -04:00
Julia Reynolds
9a1c0dce7a Handle app uninstall via Storage & USB. 
Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2
 2015-07-27 11:13:25 -04:00
Adrian Roos
2f00f2c84a am 8fee8176: am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec 
* commit '8fee817698c3a238e3f373eb93f1607cd2cbea0e':
  Update FRP warning to spec
 2015-07-25 16:37:13 +00:00
Adrian Roos
b87428a61d am 5ada0050: am 38c9b9eb: Update FRP warning to spec 
* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
  Update FRP warning to spec
 2015-07-25 15:54:26 +00:00
Adrian Roos
38c9b9eb5e Update FRP warning to spec 
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
 2015-07-24 15:09:34 -07:00
Sanket Padawe
3bf0db8d10 Fix issues in AP dialog arising after clicking on AP preferences. 
+Added a new flag to keep track if user wanted to modify AP by hard
pressing on AP.

Bug: 22485686
Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7
 2015-07-24 13:52:03 -07:00
Maurice Lam
63c8217bc9 am 4ac567ac: am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 
* commit '4ac567acce52d09a32e27dcdeacb1f7f899b5c08':
  [Fingerprint] Show skip button during SUW
 2015-07-24 16:07:00 +00:00
Svetoslav Ganov
104c3d3d64 am ea80c4b2: am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit 'ea80c4b2512a79e964968e235c85b145a089d3b9':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-24 03:46:08 +00:00
Jason Monk
6d2802502c am c9607b39: am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit 'c9607b39f8e34b1091f28a27c47fb4dc408fd57c':
  Fix battery detail issues with "Android OS"
 2015-07-24 03:46:07 +00:00
Jason Monk
5bc0d610ab am c19eac29: am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit 'c19eac29b6d439644e5fc5dc9504e126c61eb2e7':
  Don't show disabled apps in ignore optimizations
 2015-07-24 03:46:06 +00:00
Guang Zhu
29936b072f am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit '5ea94a9c4d27d02d989ab8571bde97112bb1747e':
  Prevent monkey from changing adoptable storage settings
 2015-07-24 03:46:04 +00:00
Pavel Zhamaitsiak
5d652622e8 am ff381a20: am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'ff381a20ca92597614f35507b663fdbcf8341cbf':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-24 03:45:57 +00:00
Jason Monk
769ba03b8f am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
  Remove tuner from development settings
 2015-07-24 03:45:55 +00:00
Maurice Lam
11d1f6d3a1 am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 
* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
  [Fingerprint] Show skip button during SUW
 2015-07-24 03:34:46 +00:00
Svetoslav Ganov
1fa5f4b336 am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit '6c2d4d73464e6026f42a615c75e3c5d7e3679d7b':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-24 03:10:41 +00:00
Jason Monk
e9b9736415 am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
  Fix battery detail issues with "Android OS"
 2015-07-24 03:10:07 +00:00
Jason Monk
9b6ff57eb5 am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit 'a119087b8ba24e930d982c30a039f7c4204fc435':
  Don't show disabled apps in ignore optimizations
 2015-07-24 03:10:05 +00:00
Maurice Lam
36c7601409 Merge "[Fingerprint] Show skip button during SUW" into mnc-dev 2015-07-24 03:08:29 +00:00
Guang Zhu
b91da24db7 am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit '402c866c3117571ddb66614fdbf963e8564a3232':
  Prevent monkey from changing adoptable storage settings
 2015-07-24 03:03:26 +00:00
Pavel Zhamaitsiak
a20eaca1a6 am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'bdc3fc3672df250ea3fd3c8a3b73048ebc232ad4':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-24 03:03:24 +00:00
Jason Monk
b46b993403 am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
  Remove tuner from development settings
 2015-07-24 03:03:23 +00:00
Svetoslav Ganov
cce844a7a3 Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 2015-07-23 21:47:10 +00:00
Jason Monk
8bf5f3075e Merge "Fix battery detail issues with "Android OS"" into mnc-dev 2015-07-23 20:23:57 +00:00
Jason Monk
9927acd3ad Merge "Don't show disabled apps in ignore optimizations" into mnc-dev 2015-07-23 20:23:09 +00:00
Maurice Lam
cff4eb9b73 am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 20:09:28 +00:00
Maurice Lam
3b798650fc am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '06dc59305fa7e0f72245471763843dcb8997f4e0':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 20:09:27 +00:00
Maurice Lam
7a33511397 am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 19:18:51 +00:00