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

20542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurice Lam
a9a04efe89 [LockScreenSetup] Move retry button to top 
Move retry button to top, under the subheader, and change the label
to "Clear". Also hide the footer textView since all footer labels are
currently empty.

Bug: 20916604
Change-Id: I7915a132945687815dbb16ce0a60207cc02eed2b
 2015-05-21 03:04:11 +00:00
Fyodor Kupolov
bd188ea550 am b7d361af: am b995c78f: (-s ours) Merge "Added SearchIndexProvider for UserSettings" 
* commit 'b7d361af0f53ae36ea672491bce6c04a6c45aeda':
  Added SearchIndexProvider for UserSettings
 2015-05-21 00:37:28 +00:00
Fyodor Kupolov
b7d361af0f am b995c78f: (-s ours) Merge "Added SearchIndexProvider for UserSettings" 
* commit 'b995c78fbbbab8060e5101fb1bee03adf509a786':
  Added SearchIndexProvider for UserSettings
 2015-05-21 00:28:46 +00:00
Fyodor Kupolov
b995c78fbb Merge "Added SearchIndexProvider for UserSettings" 2015-05-20 23:40:50 +00:00
Sean Francis-Lyon
d2e31fd9eb Merge "removing google specific language from aosp strings" 2015-05-20 23:22:48 +00:00
Xiyuan Xia
4a8edaf8b0 Do not show soft keyboard when locked out 
- Remove stateVisible for ConfirmLockPassword activity so that
  soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
  activity window gains focus;

Bug:20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a
 2015-05-20 14:43:36 -07:00
Fyodor Kupolov
580e2e7ce1 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-20 14:23:52 -07:00
Jorim Jaggi
4a347caa72 am 4d1e3862: am 84caa256: am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 
* commit '4d1e3862c29bd0600179468ca6f7149767f53ab6':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
 2015-05-20 19:35:50 +00:00
Jorim Jaggi
4d1e3862c2 am 84caa256: am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 
* commit '84caa2569722b2ee8234c9a6856a32e148f54463':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
 2015-05-20 19:25:47 +00:00
Jorim Jaggi
84caa25697 am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 
* commit 'b56a10368fa3b7f2a359c8cf4a7abf1ba7edf232':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
 2015-05-20 19:11:45 +00:00
Jorim Jaggi
b56a10368f Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 2015-05-20 19:01:50 +00:00
Sean Francis-Lyon
d502e97e6c removing google specific language from aosp strings 
Change-Id: I2787f8390adcb5dfd6098ee0f1bf50bb51f3f349
 2015-05-20 11:29:36 -07:00
Lorenzo Colitti
71d9ac667a am 39a67fd5: am 8f4bf867: am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 
* commit '39a67fd5cfc7a585303191db050a82bdb38f38bd':
  Address TODOs in WifiNoInternetDialog.
 2015-05-20 13:18:00 +00:00
Maurice Lam
f650c72212 am 7a2eae76: am 12bbde91: am efbe4661: Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev 
* commit '7a2eae76fc9597541a66bc8dbad084ed021ca405':
  [LockScreen] Update initial string in choose lock screens
 2015-05-20 13:16:20 +00:00
Lorenzo Colitti
39a67fd5cf am 8f4bf867: am f675409e: Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev 
* commit '8f4bf8677c022fe7368ba4c9a96ac9e8de778a70':
  Address TODOs in WifiNoInternetDialog.
 2015-05-20 09:56:41 +00:00
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