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

20527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
8f4bf8677c am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 
* commit 'f675409e238bcd3df44fe0026a49e89cd30a5bdf':
  Address TODOs in WifiNoInternetDialog.
 2015-05-20 09:47: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
12bbde919b am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev 
* commit 'efbe46612d3253e683ec14cadabf638450b39486':
  [LockScreen] Update initial string in choose lock screens
 2015-05-20 01:50:50 +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
e698169afb am eecff41c: am dc774b61: am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 
* commit 'eecff41cfc812981a8437d2d9b554a18a3a32a05':
  Added SearchIndexProvider for UserSettings
 2015-05-19 23:02:54 +00:00
Jeff Sharkey
4a99db6887 am 1ccf4441: am 719d0ad9: am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev 
* commit '1ccf44418ea5c86406136380434be52a3effda3a':
  Warn user when adopted device is slow.
 2015-05-19 23:02:53 +00:00
Xiyuan Xia
9c073e93c4 am a61ad9e5: am 0fa945f0: am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev 
* commit 'a61ad9e5e58cf12eecd73717f9dec6bb48e895e7':
  No input instead of disabling password/pin entry
 2015-05-19 23:02:51 +00:00
Guang Zhu
4d7cac9936 am 7375f0df: am b340980d: am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev 
* commit '7375f0df8940653eb13801b6583a5e4746a42fef':
  Monkey should not be allowed to switch USB mode
 2015-05-19 23:02:50 +00:00
Nicolas Prevot
6e851981da am 93a46554: am e60c44a8: am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev 
* commit '93a465546094e6a8f40afdeaf1673682e0eb2297':
  Remove the check hasMultipleUsers in Settings.
 2015-05-19 23:02:49 +00:00
Jason Monk
b9d7a14973 am 070b24ad: am 0a42a67d: am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev 
* commit '070b24ade271d704710ada32ee936bbfa4c25bd1':
  Default ignore optimizations to show system apps
 2015-05-19 23:02:48 +00: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
Nicolas Prevot
93a4655460 am e60c44a8: am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev 
* commit 'e60c44a8e6ac1fe0c22d57f649462d3657cb293e':
  Remove the check hasMultipleUsers in Settings.
 2015-05-19 22:50:35 +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
dc774b618b am c80084e5: Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 
* commit 'c80084e55afeaeebfb0546c0112fb2e666e35700':
  Added SearchIndexProvider for UserSettings
 2015-05-19 21:47:04 +00:00
Fyodor Kupolov
c80084e55a Merge "Added SearchIndexProvider for UserSettings" into mnc-dev 2015-05-19 21:44:17 +00:00
Fyodor Kupolov
f9756ec187 am db80e588: am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings." 
* commit 'db80e588c0f2c585e3dddb79fdd35b3f50ba8bb2':
  Remove the check hasMultipleUsers in Settings.
 2015-05-19 21:31:19 +00:00
Fyodor Kupolov
db80e588c0 am e84a5eac: Merge "Remove the check hasMultipleUsers in Settings." 
* commit 'e84a5eac2cff89a2e380935ee10c685e4b1a58f0':
  Remove the check hasMultipleUsers in Settings.
 2015-05-19 21:17:48 +00:00
Jorim Jaggi
3099997b46 Fix string for fingerprint settings 
Also adjust fingerprint enrollment animation to spec.

Bug: 21030545
Change-Id: I937e4ea7ab4a51fa0b57b8b4c6b3038453d8f05e
 2015-05-19 14:10:05 -07:00
Jorim Jaggi
712530794b Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2) 
Change-Id: I7623488349209248596827d03fd77cd128f8b2b4
 2015-05-19 14:02:05 -07:00
Jeff Sharkey
719d0ad904 am d0393cd0: Merge "Warn user when adopted device is slow." into mnc-dev 
* commit 'd0393cd0417ecc8aed686578381745a88fb77f92':
  Warn user when adopted device is slow.
 2015-05-19 19:10:53 +00:00
Jeff Sharkey
d0393cd041 Merge "Warn user when adopted device is slow." into mnc-dev 2015-05-19 19:03:35 +00:00
Jeff Sharkey
0de2014380 Warn user when adopted device is slow. 
For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.

Bug: 21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47
 2015-05-19 12:00:56 -07:00
Xiyuan Xia
0fa945f099 am 3a310719: Merge "No input instead of disabling password/pin entry" into mnc-dev 
* commit '3a310719d816b8608cd51469c62231a1ed41a608':
  No input instead of disabling password/pin entry
 2015-05-19 18:39:31 +00:00
Fyodor Kupolov
c9a95ef6e7 Added SearchIndexProvider for UserSettings 
It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.

Bug: 21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242
 2015-05-19 11:31:49 -07:00
Xiyuan Xia
3a310719d8 Merge "No input instead of disabling password/pin entry" into mnc-dev 2015-05-19 18:30:19 +00:00
Guang Zhu
b340980dee am ccfbb1d6: Merge "Monkey should not be allowed to switch USB mode" into mnc-dev 
* commit 'ccfbb1d6ca30dd495938a6e68ca02410e7ffb6c7':
  Monkey should not be allowed to switch USB mode
 2015-05-19 18:21:53 +00:00
Guang Zhu
ccfbb1d6ca Merge "Monkey should not be allowed to switch USB mode" into mnc-dev 2015-05-19 18:14:48 +00:00
Guang Zhu
72aa537980 Monkey should not be allowed to switch USB mode 
Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62
 2015-05-19 11:09:40 -07:00
Nicolas Prevot
e60c44a8e6 am e74fdb8d: Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev 
* commit 'e74fdb8d672a361f5a29cded65278054e1683fc6':
  Remove the check hasMultipleUsers in Settings.
 2015-05-19 18:09:12 +00:00
Jason Monk
0a42a67d4e am 2b768522: Merge "Default ignore optimizations to show system apps" into mnc-dev 
* commit '2b7685224d1021a9e163a2ffc4bf4e8d38b56252':
  Default ignore optimizations to show system apps
 2015-05-19 18:09:11 +00:00
Nicolas Prevot
e74fdb8d67 Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev 2015-05-19 17:58:46 +00:00
Jason Monk
2b7685224d Merge "Default ignore optimizations to show system apps" into mnc-dev 2015-05-19 17:57:13 +00:00
Fyodor Kupolov
e84a5eac2c Merge "Remove the check hasMultipleUsers in Settings." 2015-05-19 17:50:01 +00:00
Jason Monk
2c56d450dd Default ignore optimizations to show system apps 
Bug: 21211422
Change-Id: Ied526cffa86406b8b81824cf2cdb03cc37bb7433
 2015-05-19 13:08:39 -04:00
Lorenzo Colitti
56bd6c338e Address TODOs in WifiNoInternetDialog. 
Bug: 20081183
Change-Id: I30a4f04ca892796a674ff0306aafaed485126092
 2015-05-20 00:37:38 +09:00
Robin Lee
148c327fb3 am 4dda36a2: am 7526238a: am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev 
* commit '4dda36a220ee646e4a22bd2d6f44be5b1c6d568b':
  Badge managed WiFi networks
 2015-05-19 13:53:50 +00:00
Robin Lee
4dda36a220 am 7526238a: am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev 
* commit '7526238a74fe4565a8ed2c29b43e8535650fb4b1':
  Badge managed WiFi networks
 2015-05-19 13:42:54 +00:00
Robin Lee
7526238a74 am 196d0543: Merge "Badge managed WiFi networks" into mnc-dev 
* commit '196d0543737cef8fcf5e193af688a093a3743597':
  Badge managed WiFi networks
 2015-05-19 13:31:37 +00:00
Robin Lee
196d054373 Merge "Badge managed WiFi networks" into mnc-dev 2015-05-19 13:22:10 +00:00
Robin Lee
2196afd9ae am d234296b: am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 
* commit 'd234296b96d6dfbcf2fef205d7b86a1456e69631':
  VPN: UI for forgetting disconnected VPNs
 2015-05-19 10:48:26 +00:00
Robin Lee
d234296b96 am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 
* commit 'c0d07e314a74a3910fee969a55e442f045979ed7':
  VPN: UI for forgetting disconnected VPNs
 2015-05-19 10:36:51 +00:00
Robin Lee
c0d07e314a am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 
* commit 'b5c48a4c347f7aa64b99e80370a63b3f60d3203c':
  VPN: UI for forgetting disconnected VPNs
 2015-05-19 10:25:58 +00:00
Robin Lee
b5c48a4c34 Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev 2015-05-19 10:15:04 +00:00
Jorim Jaggi
82ac6fa4e3 am 65e43332: am a351cda3: am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev 
* commit '65e43332cc5d742b5ecb71095cb911be21515767':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
 2015-05-19 05:14:01 +00:00
Jorim Jaggi
65e43332cc am a351cda3: am a2138a34: Merge "Add setting to disable assist data (2/2)." into mnc-dev 
* commit 'a351cda36ef5f3f81e6aadeea9f9dc2b36701faf':
  Add setting to disable assist data (2/2).
  Try not to crash while AppInfo is finishing
  Banish the memory page to Apps > Advanced
  Fix crash when removing fingerprint
  Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException
 2015-05-19 05:02:24 +00:00