PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,171 Commits 1 Branch 0 Tags
38b48086bc47c6218437e6fcd8b907b51a9cff36
Commit Graph

7011 Commits

Author SHA1 Message Date
Jason Monk
888605debd am f680c691: am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev 
* commit 'f680c6919184cbe6750d64b3d0e7a4487514f9db':
  Fix dashboard shadows on tablets
 2015-06-04 16:43:08 +00:00
Jason Monk
f680c69191 am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev 
* commit '34784ec862d86e2f3b3b115e7c065b052b7bc888':
  Fix dashboard shadows on tablets
 2015-06-04 16:21:43 +00:00
John Spurlock
11d500c9d1 am dec8f810: am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev 
* commit 'dec8f8107c13a0a6f0ff4e8d65139eb139a20850':
  Settings: Add zen rule name warning text.
 2015-06-04 16:16:16 +00:00
Jason Monk
34784ec862 Merge "Fix dashboard shadows on tablets" into mnc-dev 2015-06-04 16:14:32 +00:00
Jason Monk
00dccfcbe8 Fix dashboard shadows on tablets 
Bug: 19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581
 2015-06-04 12:04:30 -04:00
John Spurlock
dec8f8107c am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev 
* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
  Settings: Add zen rule name warning text.
 2015-06-04 16:04:13 +00:00
John Spurlock
afa64f45ab am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev 
* commit '1a1181edde0d8d941161e941f12e6783f25ae43d':
  Settings: Add zen rule name warning text.
 2015-06-04 15:51:05 +00:00
John Spurlock
1a1181edde Merge "Settings: Add zen rule name warning text." into mnc-dev 2015-06-04 15:41:58 +00:00
John Spurlock
7b4d1e2cb8 Settings: Add zen rule name warning text. 
Bug: 21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
 2015-06-04 11:37:36 -04:00
Jason Monk
3307c649c5 am fb8de829: am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev 
* commit 'fb8de829b51bf5168590a3a2a468578b5970106f':
  Disable owner info when no lock screen
 2015-06-04 13:45:31 +00:00
Jason Monk
fb8de829b5 am 1b53d0c2: am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev 
* commit '1b53d0c25be74260dc654b481876a5e2d9ad18a8':
  Disable owner info when no lock screen
 2015-06-04 13:32:56 +00:00
Jason Monk
1b53d0c25b am 41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev 
* commit '41012d5e7b37fe5c2373f3215612d26331f40ba0':
  Disable owner info when no lock screen
 2015-06-04 13:20:27 +00:00
Jason Monk
41012d5e7b Merge "Disable owner info when no lock screen" into mnc-dev 2015-06-04 13:08:48 +00:00
Jim Miller
e7f78bd17b am 1955fc5f: am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev 
* commit '1955fc5fb52d154017c52c069440824ec3d8d27e':
  Revert "Fix some dark theme issues"
 2015-06-04 03:22:08 +00:00
Jim Miller
1955fc5fb5 am dddca46b: am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev 
* commit 'dddca46b581e0c40868242cb3952da8b409cc9c6':
  Revert "Fix some dark theme issues"
 2015-06-04 03:11:42 +00:00
Jim Miller
dddca46b58 am 471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev 
* commit '471da56938c2ca8102f7740b3eb5704f48d86aff':
  Revert "Fix some dark theme issues"
 2015-06-04 02:59:20 +00:00
Jim Miller
471da56938 Merge "Revert "Fix some dark theme issues"" into mnc-dev 2015-06-04 02:52:12 +00:00
Jim Miller
6433bd8f6a Revert "Fix some dark theme issues" 
This breaks the pattern entry screens of SecuritySettings.  Reverting until we can take a closer look.


This reverts commit cb8ccbb3b5.

Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
 2015-06-04 02:45:40 +00:00
Stuart Scott
9a8933ab5f am 9eb4d103: am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit '9eb4d103450b3a6d2682f0ff8d5f8806518ae058':
  Re-add a string which was accidently removed.
 2015-06-04 01:28:13 +00:00
Stuart Scott
9eb4d10345 am 01a6351f: am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit '01a6351f7afd4af10538a0b1cf4ed48cd2d7396a':
  Re-add a string which was accidently removed.
 2015-06-04 01:14:18 +00:00
Stuart Scott
01a6351f7a am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev 
* commit 'fcf64237b72b506d6f45717d8f7252fb656c5fa4':
  Re-add a string which was accidently removed.
 2015-06-04 01:03:15 +00:00
Stuart Scott
fcf64237b7 Merge "Re-add a string which was accidently removed." into mnc-dev 2015-06-04 00:51:17 +00:00
Stuart Scott
1da842af41 Re-add a string which was accidently removed. 
bug:20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
 2015-06-03 17:01:42 -07:00
Jason Monk
0847796339 Disable owner info when no lock screen 
Bug: 20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e
 2015-06-03 16:37:07 -04:00
Jason Monk
53f7cddd94 am 48424d9d: am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev 
* commit '48424d9def5175cc03ca722bcd73bf7cf3267f9d':
  Fix some dark theme issues
 2015-06-03 19:23:47 +00:00
Jason Monk
ea0aa049ad am 174ed18d: am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev 
* commit '174ed18d90a827814c931e08772bbf408ec4033f':
  Reorder device category
 2015-06-03 19:23:44 +00:00
Barnaby James
3571671d99 am 6a441e2a: am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev 
* commit '6a441e2aba09d350df4834e21d72c43afaea8634':
  Fix TTS for Zen mode voice activity.
 2015-06-03 19:23:43 +00:00
Xiyuan Xia
8b89e373fd am b2508e10: am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev 
* commit 'b2508e10d1d8676d78a466b0c337a71a3d03dbb8':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
 2015-06-03 19:23:42 +00:00
Jason Monk
48424d9def am 84cd3bfb: am 0732a646: Merge "Fix some dark theme issues" into mnc-dev 
* commit '84cd3bfb43174215abb8648e14e0481380b27828':
  Fix some dark theme issues
 2015-06-03 18:48:01 +00:00
Jason Monk
174ed18d90 am 748c9381: am e6d7623c: Merge "Reorder device category" into mnc-dev 
* commit '748c938135c73ef6fa3c5d5777d4dd4cf8a8b0e3':
  Reorder device category
 2015-06-03 18:47:59 +00:00
Barnaby James
6a441e2aba am fc32d510: am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev 
* commit 'fc32d5101dfdf38dbe7c1da4382cedc1015208a5':
  Fix TTS for Zen mode voice activity.
 2015-06-03 18:46:07 +00:00
Xiyuan Xia
b2508e10d1 am 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev 
* commit '3bab71f843e713f1325ae043668442ee9387258f':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
 2015-06-03 18:46:05 +00:00
Geoff Mendal
26e8b0bf7d Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 18:18:44 +00:00
Jason Monk
84cd3bfb43 am 0732a646: Merge "Fix some dark theme issues" into mnc-dev 
* commit '0732a646020d97ab38c247cce21674838715c322':
  Fix some dark theme issues
 2015-06-03 18:12:58 +00:00
Jason Monk
748c938135 am e6d7623c: Merge "Reorder device category" into mnc-dev 
* commit 'e6d7623ca704e0d42d433e573423611a82d7cd5c':
  Reorder device category
 2015-06-03 18:12:53 +00:00
Geoff Mendal
7d4b52a1f6 Import translations. DO NOT MERGE 
Change-Id: Id0f8d1901b248c78ee0903628bde034c9f8addd5
Auto-generated-cl: translation import
 2015-06-03 11:04:23 -07:00
Barnaby James
fc32d5101d am ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev 
* commit 'ef0b43625c8aa3e8519888e4e185daa77b33dc2a':
  Fix TTS for Zen mode voice activity.
 2015-06-03 17:42:34 +00:00
Xiyuan Xia
3bab71f843 am d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev 
* commit 'd9e92ea551af6b65deb88ea68a229fac03030d03':
  Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
 2015-06-03 17:41:16 +00:00
Jason Monk
0732a64602 Merge "Fix some dark theme issues" into mnc-dev 2015-06-03 17:30:54 +00:00
Geoff Mendal
cc4307c263 Import translations. DO NOT MERGE 
Change-Id: I2c74b8fc650d34244ba6eda02f40295f643d0395
Auto-generated-cl: translation import
 2015-06-03 10:30:27 -07:00
Jason Monk
cb8ccbb3b5 Fix some dark theme issues 
Bug: 21117509
Bug: 21077345
Bug: 21480587
Change-Id: I61bcd6631288b0e51204ac8bf134c44b2800e0fe
 2015-06-03 13:29:16 -04:00
Jason Monk
e6d7623ca7 Merge "Reorder device category" into mnc-dev 2015-06-03 17:22:00 +00:00
Jason Monk
f48c89ff7c Reorder device category 
Bug: 21588753
Change-Id: Ie01ad44b3bc9d2d3cac165e25b72a112896d4d2c
 2015-06-03 13:18:07 -04:00
Barnaby James
ef0b43625c Merge "Fix TTS for Zen mode voice activity." into mnc-dev 2015-06-03 17:09:56 +00:00
Xiyuan Xia
4458fd6e57 Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText 
- Revert previous "Add announceForAccessibility to ConfirmLockPattern";
- Add android:accessibilityLiveRegion="polite" for errorText in
  ConfirmLockPassword/Pattern;

Bug:20282779
Change-Id: I4b9c0d461d0dd0504bd88a8a2144e09a42d5f64e
 2015-06-02 15:27:59 -07:00
Jason Monk
78da3e6d67 am 3eccde2e: am 8c48a9b1: am 0d7d9272: Change DeviceProfilesSettings to DialogFragment 
* commit '3eccde2e05c07b7fd65ba82f21862ae077c7051d':
  Change DeviceProfilesSettings to DialogFragment
 2015-06-02 21:25:42 +00:00
Jason Monk
26e34e3d9e am f723447c: am 84abde71: am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev 
* commit 'f723447cbf52049329c13acb7ad60104e5df0104':
  Fix battery usage screen issues
 2015-06-02 21:25:40 +00:00
Jason Monk
3eccde2e05 am 8c48a9b1: am 0d7d9272: Change DeviceProfilesSettings to DialogFragment 
* commit '8c48a9b11961d41c8a090d38daeb972462dcec45':
  Change DeviceProfilesSettings to DialogFragment
 2015-06-02 21:16:28 +00:00
Jason Monk
f723447cbf am 84abde71: am 1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev 
* commit '84abde71471b6631d7f12f47ef9c92360cbdbafc':
  Fix battery usage screen issues
 2015-06-02 21:10:27 +00:00
Jason Monk
8c48a9b119 am 0d7d9272: Change DeviceProfilesSettings to DialogFragment 
* commit '0d7d927216e536ead911f4949134ca362af345ab':
  Change DeviceProfilesSettings to DialogFragment
 2015-06-02 20:54:59 +00:00