PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,843 Commits 1 Branch 0 Tags
7cd90e012c5f7c99f20918f4515d7b76a03a8f9e
Commit Graph

24843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
6356ee4bcb am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit 'cce844a7a31c4aec0770c40c7a9a805cb48b9f31':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-23 22:42:28 +00:00
Jason Monk
06621a57fd am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
  Fix battery detail issues with "Android OS"
 2015-07-23 22:42:06 +00:00
Jason Monk
5b3921e44a am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit '9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
  Don't show disabled apps in ignore optimizations
 2015-07-23 22:42:05 +00:00
Guang Zhu
8a4dda6786 am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
  Prevent monkey from changing adoptable storage settings
 2015-07-23 22:41:48 +00:00
Selim Cinek
b48e9fdcab Adapted a string in the fingerprint enrollment flow 
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
 2015-07-23 15:29:01 -07:00
Svetoslav Ganov
6c2d4d7346 am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 
* commit 'cce844a7a31c4aec0770c40c7a9a805cb48b9f31':
  Reset permissions and app links when clearing app preferences - settings
 2015-07-23 21:56:56 +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
14983fc664 am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
  Fix battery detail issues with "Android OS"
 2015-07-23 20:32:34 +00:00
Jason Monk
a119087b8b am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit '9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
  Don't show disabled apps in ignore optimizations
 2015-07-23 20:32:32 +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
Maurice Lam
1f95e5125f am 3f7ff2b6: am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit '3f7ff2b60f85cf9bb39e3bb3551bcdbfa916fafa':
  [ScreenLock] Update illustration during setup wizard
 2015-07-23 20:26:12 +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
3f7ff2b60f am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit '391e65e46594553515036cff019c9faaa2f2faf5':
  [ScreenLock] Update illustration during setup wizard
 2015-07-23 20:09:26 +00:00
Maurice Lam
ea0f0fdfa2 am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '7a33511397e1f69bbb920dd64a6544f65557ea44':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 19:46:31 +00:00
Maurice Lam
06dc59305f am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '705def9a227fb19290308a815049e75f62005bee':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 19:46:29 +00:00
Maurice Lam
391e65e465 am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit 'a5fa39dd13552886ebe9903fcbd6084a9521fd16':
  [ScreenLock] Update illustration during setup wizard
 2015-07-23 19:46:28 +00:00
Guang Zhu
402c866c31 am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
  Prevent monkey from changing adoptable storage settings
 2015-07-23 19:32:40 +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
Maurice Lam
a5fa39dd13 am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit 'ad904de84644ab72754fe7d0cc5a34d1928c03f1':
  [ScreenLock] Update illustration during setup wizard
 2015-07-23 19:18:48 +00:00
Pavel Zhamaitsiak
bdc3fc3672 am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'd9e0ed1b3e8d1584496d041a1081aaea9fdc7d41':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-23 19:13:06 +00:00
Jason Monk
6d8fdb8294 am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
  Remove tuner from development settings
 2015-07-23 19:13:05 +00:00
Pavel Zhamaitsiak
8a222530be am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'd9e0ed1b3e8d1584496d041a1081aaea9fdc7d41':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-23 18:27:36 +00:00
Jason Monk
e2840f1ce3 am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
  Remove tuner from development settings
 2015-07-23 18:27:32 +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
Maurice Lam
9b6bd390f9 am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-22 20:23:18 +00:00
Maurice Lam
f1fbf9cca4 am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '3c1f46dc2c3d6b0a9c0c39d0cc327380a3f8f078':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-22 20:23:17 +00:00
Maurice Lam
ad904de846 am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
  [ScreenLock] Update illustration during setup wizard
 2015-07-22 20:23:15 +00:00
Maurice Lam
2f2779acce am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-22 20:17:37 +00:00
Maurice Lam
9dd92338d0 am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '3c1f46dc2c3d6b0a9c0c39d0cc327380a3f8f078':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-22 20:17:34 +00:00
Maurice Lam
899d0a2894 am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
  [ScreenLock] Update illustration during setup wizard
 2015-07-22 20:17:33 +00:00
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Maurice Lam
9e1429a54b Merge "[Fingerprint] Add strings for fingerprint during SUW" 2015-07-22 18:27:43 +00:00
Maurice Lam
760c4f1b5d [Fingerprint] Add strings for fingerprint during SUW 
Bug: 22630959
Change-Id: I81aeb498f11bd27d56983776fd36fdbf38f25883
 2015-07-22 11:21:31 -07:00
Geoff Mendal
a65188fefc am 7840a5cb: (-s ours) am 655698be: (-s ours) am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE 
* commit '7840a5cb9a28534eeec8333f9fb1f4c3d81b6ccb':
  Import translations. DO NOT MERGE
 2015-07-22 14:52:16 +00:00
Geoff Mendal
7840a5cb9a am 655698be: (-s ours) am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE 
* commit '655698be8ebe635e61d5d8215a7f0e3855877f0b':
  Import translations. DO NOT MERGE
 2015-07-22 14:38:32 +00:00
Geoff Mendal
655698be8e am 741f3665: (-s ours) am 0a167c40: (-s ours) Import translations. DO NOT MERGE 
* commit '741f3665dbd543ebd9abe0e9e3258ecbd07fa209':
  Import translations. DO NOT MERGE
 2015-07-22 14:25:13 +00:00
Yasuhiro Matsuda
4a109b1d87 Handle the case where USB_STATE intent is not received yet. 
Call updateUsbConfigurationValues() when ACTION_USB_STATE intent
is not yet received so that mUsbConfiguration value is properly
initialized in this case.

BUG: 22163689
Change-Id: I2aeed43fc49e40c52cdc2bfc08d43081815b49d1
 2015-07-22 23:20:05 +09:00
Jason Monk
82f30d2a41 Fix battery detail issues with "Android OS" 
Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
 2015-07-22 10:12:05 -04:00
Geoff Mendal
741f3665db am 0a167c40: (-s ours) Import translations. DO NOT MERGE 
* commit '0a167c400af710fe97d7491abdffbe54bec42761':
  Import translations. DO NOT MERGE
 2015-07-22 14:10:23 +00:00
Geoff Mendal
0a167c400a Import translations. DO NOT MERGE 
Change-Id: Iee7522d01901078d3a091eb4a6e9175e664e99e2
Auto-generated-cl: translation import
 2015-07-22 06:59:04 -07:00
Geoff Mendal
9c17fab30f Import translations. DO NOT MERGE 
Change-Id: I06e1210f46fc7a5e9e822b4bb4d11f7531c2c5eb
Auto-generated-cl: translation import
 2015-07-22 06:11:39 -07:00