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
81ce2ea882
am 2f00f2c8
: am 8fee8176
: am b87428a6
: am 5ada0050
: am 38c9b9eb
: Update FRP warning to spec
...
* commit '2f00f2c84a8e0f99c7ccb35157a63128ec98c19a':
Update FRP warning to spec
2015-07-25 16:54:16 +00: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
Zach Johnson
356fce4606
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
...
Once they are enabled for the first time, they'll show up indefinitely.
b/22667081
Change-Id: Ia28de99d7d638d54c15fac2e08edeb70a9657e23
2015-07-24 16:46:31 -07: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
9a946b3cac
am 63c8217b
: am 4ac567ac
: am 11d1f6d3
: am f16673ba
: am 36c76014
: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
...
* commit '63c8217bc95e5f29f0be5a964b45086c84372e35':
[Fingerprint] Show skip button during SUW
2015-07-24 17:21:19 +00: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
c4b467e1f3
am 104c3d3d
: am ea80c4b2
: am 1fa5f4b3
: am 6c2d4d73
: am cce844a7
: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
...
* commit '104c3d3d641f87bd18c35cd2e0d584a515b9fb32':
Reset permissions and app links when clearing app preferences - settings
2015-07-24 04:50:05 +00:00
Jason Monk
47067c7f29
am 6d280250
: am c9607b39
: am e9b97364
: am 14983fc6
: am 8bf5f307
: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
...
* commit '6d2802502cbd69552de7a28c3850ec6d1a75cefc':
Fix battery detail issues with "Android OS"
2015-07-24 04:50:03 +00:00
Jason Monk
39c9460f38
am 5bc0d610
: am c19eac29
: am 9b6ff57e
: am a119087b
: am 9927acd3
: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
...
* commit '5bc0d610ab0dc003afe356a1c8851d668ad2f5d8':
Don't show disabled apps in ignore optimizations
2015-07-24 04:50:02 +00:00
Guang Zhu
5e83b0d9fa
am 29936b07
: am 5ea94a9c
: am b91da24d
: am 402c866c
: am c1bef743
: Prevent monkey from changing adoptable storage settings
...
* commit '29936b072f9d1623b16356b6837d38b7c865cb60':
Prevent monkey from changing adoptable storage settings
2015-07-24 04:50:00 +00:00
Pavel Zhamaitsiak
2fab133a24
am 5d652622
: am ff381a20
: am a20eaca1
: am bdc3fc36
: am d9e0ed1b
: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
...
* commit '5d652622e836738cff848ec4597ddaca92658db5':
Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 04:49:59 +00:00
Colin Cross
dab025bdff
resolved conflicts for merge of 769ba03b
to master
...
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07: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
Maurice Lam
95d1eb90d3
am cff4eb9b
: am ea0f0fdf
: am 7a335113
: am 9b6bd390
: am 32b96646
: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:26:15 +00:00
Maurice Lam
4e05ceea19
am 3b798650
: am 06dc5930
: am 705def9a
: am f1fbf9cc
: am 3c1f46dc
: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
...
* commit '3b798650fc30a6b2b3b7a28325b7b40b8173baf1':
[Fingerprint] Send RESULT_CANCELED when back from Add another
2015-07-23 20:26:14 +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
Maurice Lam
705def9a22
am f1fbf9cc
: am 3c1f46dc
: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
...
* commit 'f1fbf9cca44d8a16bc1af92964558cf91ac00161':
[Fingerprint] Send RESULT_CANCELED when back from Add another
2015-07-23 19:18:50 +00:00
Guang Zhu
c1bef7430e
Prevent monkey from changing adoptable storage settings
...
Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
2015-07-23 10:57:59 -07:00
Pavel Zhamaitsiak
d9e0ed1b3e
Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
2015-07-23 16:54:55 +00:00
Svet Ganov
841bb3d336
Reset permissions and app links when clearing app preferences - settings
...
bug:22359132
Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
2015-07-23 09:40:16 -07:00
Pavel Zhamaitsiak
3e7e2c57d4
Add or remove WFC setting when Wireless settings activity is resumed
...
WFC availability changes when SIM is inserted/removed. Settings
should be updated if this has happened.
Bug: 22642035
Change-Id: I361748440033e703b771175aa79767c53f0da458
2015-07-23 09:31:58 -07:00
Maurice Lam
5f8d7dbe52
[Fingerprint] Show skip button during SUW
...
Show a skip button during enrolling in case the user entered the flow
accidentally. The skip button will send the result code RESULT_SKIP,
which is equal to RESULT_FIRST_USER + 1, back to the starting
activity.
Bug: 22666389
Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1
2015-07-22 16:51:47 -07:00
Jason Monk
838c843217
Merge "Remove tuner from development settings" into mnc-dev
2015-07-22 19:29:59 +00:00