PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,873 Commits 1 Branch 0 Tags
7e1bbeee65d36ae8abaa2655987befec5517ff11
Commit Graph

19873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
7e1bbeee65 am fae9ca8c: am a9657f55: Merge "Add Pacific/Noumea." 
* commit 'fae9ca8cd505df1b97679f7bafd0621eb9ccf2ec':
  Add Pacific/Noumea.
 2015-04-28 21:53:31 +00:00
Elliott Hughes
fae9ca8cd5 am a9657f55: Merge "Add Pacific/Noumea." 
* commit 'a9657f553d2db21f99f1129cb18490d7e2497b31':
  Add Pacific/Noumea.
 2015-04-28 21:33:52 +00:00
Elliott Hughes
a9657f553d Merge "Add Pacific/Noumea." 2015-04-28 20:41:53 +00:00
Elliott Hughes
23ae8827c1 Add Pacific/Noumea. 
Also move Majuro to the right place in the list. It's +11, not -11.

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
 2015-04-28 13:35:25 -07:00
Jorim Jaggi
d2931b321c Merge "Add animation for fingerprint icon" 2015-04-28 19:20:50 +00:00
Sudheer Shanka
d188c68094 am f1fa3c7a: am 3ad534aa: am bc956309: Update warning dialog on work profile deletion. 
* commit 'f1fa3c7a3daa6642b20d1afda9ce30f996ae8866':
  Update warning dialog on work profile deletion.
 2015-04-28 15:27:25 +00:00
Geoff Mendal
f4f16f5d60 am 39285862: (-s ours) am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE 
* commit '392858626b0b4583a71372a9b05be94927958d2f':
  Import translations. DO NOT MERGE
 2015-04-28 15:27:23 +00:00
Alan Viverette
9beaa1791b am d508cd9b: am fb7827f3: am d4988442: Point to Material.Settings themes 
* commit 'd508cd9b6f7d7e567d1989be4b365bfee0112704':
  Point to Material.Settings themes
 2015-04-28 15:27:21 +00:00
Yorke Lee
4d8211e69e am beed867a: am 80848e20: am 169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev 
* commit 'beed867ada66f98c1867dbf4bdbb13d1bb0c1a81':
  Rename setDefaultDialerApplication for consistency
 2015-04-28 15:27:19 +00:00
Jorim Jaggi
6f8cd2c8a2 am 0f6400fa: am 80134266: am 4a2423ba: Move fingerprint enroll logic into sidecar fragment 
* commit '0f6400fac5ba7d9956505f7035545fe082a33f26':
  Move fingerprint enroll logic into sidecar fragment
 2015-04-28 15:27:17 +00:00
Jorim Jaggi
157edc8969 am a1bc287c: am 6ecd1005: am 11eae045: Allow incremental builds for settings. 
* commit 'a1bc287cc34a5d62c47f3c9768ab3d080234de7b':
  Allow incremental builds for settings.
 2015-04-28 15:27:16 +00:00
Maurice Lam
3201b7bdb6 am 3cd6eabc: am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev 
* commit '3cd6eabcb8cd0f36c861891c7c8d5bfdea6144e2':
  [LockSetup] Hide back button in notification interstitial
 2015-04-28 15:27:14 +00:00
Maurice Lam
7d447a7cba am bb61d7bc: am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev 
* commit 'bb61d7bc6623fe9373deb75eca180399800ad4b7':
  [WifiSetup] Show progress bar when scanning
 2015-04-28 15:27:12 +00:00
Sudheer Shanka
f1fa3c7a3d am 3ad534aa: am bc956309: Update warning dialog on work profile deletion. 
* commit '3ad534aa84da897c8c86287c02d7fe149b1668c6':
  Update warning dialog on work profile deletion.
 2015-04-28 14:55:19 +00:00
Geoff Mendal
392858626b am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE 
* commit '0baeee0c0df1cc0f8b8f23b5860b7d2ba1720432':
  Import translations. DO NOT MERGE
 2015-04-28 14:54:56 +00:00
Alan Viverette
d508cd9b6f am fb7827f3: am d4988442: Point to Material.Settings themes 
* commit 'fb7827f3be33a0d2cc5a3ee113327b4c40a7cef1':
  Point to Material.Settings themes
 2015-04-28 14:53:28 +00:00
Yorke Lee
beed867ada am 80848e20: am 169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev 
* commit '80848e20fce89d9bff9a70234ab1798546b43275':
  Rename setDefaultDialerApplication for consistency
 2015-04-28 14:53:09 +00:00
Jorim Jaggi
0f6400fac5 am 80134266: am 4a2423ba: Move fingerprint enroll logic into sidecar fragment 
* commit '8013426679ef7e650a7ef0240650d72b4132973d':
  Move fingerprint enroll logic into sidecar fragment
 2015-04-28 14:52:36 +00:00
Jorim Jaggi
a1bc287cc3 am 6ecd1005: am 11eae045: Allow incremental builds for settings. 
* commit '6ecd1005834d59a046777a80574db4cc28434ed3':
  Allow incremental builds for settings.
 2015-04-28 14:52:35 +00:00
Maurice Lam
3cd6eabcb8 am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev 
* commit 'ab82d2fdf982a3f0cd596a2703955311bb0ca6a2':
  [LockSetup] Hide back button in notification interstitial
 2015-04-28 14:51:27 +00:00
Maurice Lam
bb61d7bc66 am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev 
* commit '824b09cb41d0afcaf90c4ce0fe776d1471aa662e':
  [WifiSetup] Show progress bar when scanning
 2015-04-28 14:49:49 +00:00
Sudheer Shanka
3ad534aa84 am bc956309: Update warning dialog on work profile deletion. 
* commit 'bc95630994227736aff46885ca1d9345829e83e2':
  Update warning dialog on work profile deletion.
 2015-04-28 13:51:55 +00:00
Sudheer Shanka
bc95630994 Update warning dialog on work profile deletion. 
Bug: 20024761
Change-Id: I23b0eaa7742d9d23a29a2a48ab6e3d92fe310560
 2015-04-28 11:32:09 +00:00
Geoff Mendal
0baeee0c0d am 79670bbe: (-s ours) Import translations. DO NOT MERGE 
* commit '79670bbe68dbc6c6cc1da9f1d093dabb8099e7f5':
  Import translations. DO NOT MERGE
 2015-04-28 09:36:13 +00:00
Geoff Mendal
79670bbe68 Import translations. DO NOT MERGE 
Change-Id: I5f859b65d600018c5dc8cf650e5a7f701609acff
Auto-generated-cl: translation import
 2015-04-27 23:16:11 -07:00
Alan Viverette
fb7827f3be am d4988442: Point to Material.Settings themes 
* commit 'd4988442cbdf287e9856c3c00dad662e1ab36d2b':
  Point to Material.Settings themes
 2015-04-27 23:43:58 +00:00
Alan Viverette
d4988442cb Point to Material.Settings themes 
Bug: 20546201
Change-Id: Ib6d480d12261101c2e240b23163195ff006a41bd
 2015-04-27 23:20:18 +00:00
Yorke Lee
80848e20fc am 169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev 
* commit '169f824bfe0849de2dc2075e88e54d3248aedda7':
  Rename setDefaultDialerApplication for consistency
 2015-04-27 23:13:16 +00:00
Yorke Lee
169f824bfe Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev 2015-04-27 22:49:26 +00:00
Yorke Lee
f28c517174 Rename setDefaultDialerApplication for consistency 
Change-Id: I0749f2cbaaf0e9fd7fb8274a088ca971a33b2a36
 2015-04-27 15:18:47 -07:00
Jorim Jaggi
8013426679 am 4a2423ba: Move fingerprint enroll logic into sidecar fragment 
* commit '4a2423ba5eeee22d38942ead60bfd3bb13f44655':
  Move fingerprint enroll logic into sidecar fragment
 2015-04-27 21:57:20 +00:00
Jorim Jaggi
6ecd100583 am 11eae045: Allow incremental builds for settings. 
* commit '11eae0450b9770bdef3509a620b8c54beba2bab3':
  Allow incremental builds for settings.
 2015-04-27 21:57:18 +00:00
Jorim Jaggi
4a2423ba5e Move fingerprint enroll logic into sidecar fragment 
So enroll can continue across configuration changes.

Bug: 20495507
Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a
(cherry picked from commit 64e9c4cb2c)
 2015-04-27 21:16:22 +00:00
Jorim Jaggi
11eae0450b Allow incremental builds for settings. 
Change-Id: Iec6788d42c63020b7facfdfc45e1add244bb9523
(cherry picked from commit c9f73801df)
 2015-04-27 21:16:03 +00:00
Jorim Jaggi
2c2a41669f Add animation for fingerprint icon 
Also show the "Whoops" dialog when the finger is resting on the icon,
in addition to show it after clicking it for 3 times.

Bug: 20495507
Change-Id: I771da0671f61c13065b011d613f508827cb3b54f
 2015-04-27 14:03:50 -07:00
Jason Monk
8233790370 am 5e1e2023: am e5f7ba7f: am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev 
* commit '5e1e20237d3fbc0c1201e27bbd9fa7e21be0c430':
  Move process stats screen into memory screen.
 2015-04-27 21:03:39 +00:00
Maurice Lam
ab82d2fdf9 am 9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev 
* commit '9fab5c1d94485093e7e6d4d6e938d444872bd226':
  [LockSetup] Hide back button in notification interstitial
 2015-04-27 20:01:59 +00:00
Jorim Jaggi
88ca297352 Merge changes I021f2f3e,Iec6788d4 
* changes:
  Move fingerprint enroll logic into sidecar fragment
  Allow incremental builds for settings.
 2015-04-27 19:23:29 +00:00
Jorim Jaggi
64e9c4cb2c Move fingerprint enroll logic into sidecar fragment 
So enroll can continue across configuration changes.

Bug: 20495507
Change-Id: I021f2f3e376fcd12c7a698f5fb7f862733cb720a
 2015-04-27 12:22:23 -07:00
Maurice Lam
9fab5c1d94 Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev 2015-04-27 19:19:51 +00:00
Maurice Lam
752e5f3895 [LockSetup] Hide back button in notification interstitial 
The back button is disabled because the lock screen is already set
up. Per UX spec, we should hide the back button instead of disabling
it.

Bug: 20427092
Change-Id: Iaaf8860208179dfa5974b172013f9882827c6c4a
 2015-04-27 11:54:14 -07:00
Maurice Lam
824b09cb41 am 80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev 
* commit '80ca2687bb123ccdff299e9e1da87ae6eae354c5':
  [WifiSetup] Show progress bar when scanning
 2015-04-27 18:07:37 +00:00
Jason Monk
5e1e20237d am e5f7ba7f: am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev 
* commit 'e5f7ba7f748cc5446d96a17b5105a6b0273cc4d3':
  Move process stats screen into memory screen.
 2015-04-27 17:36:00 +00:00
Maurice Lam
80ca2687bb Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev 2015-04-27 17:31:35 +00:00
Maurice Lam
46a8e6c143 [WifiSetup] Show progress bar when scanning 
Added setProgressBarVisible method to show the progress bar when the
UI is in a transient state (e.g. enabling / disabling Wi-Fi, scanning
for access points).

Bug: 19674909
Change-Id: I82180b7949a03f6ac468f069febf0ffd1f42f1b7
 2015-04-27 10:22:28 -07:00
Geoff Mendal
6facea399f am e2b5070c: (-s ours) am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE 
* commit 'e2b5070c1096e546ff1e1429732b25c1af7d16f5':
  Import translations. DO NOT MERGE
 2015-04-27 16:17:15 +00:00
Geoff Mendal
501a8f6baa am 5312261d: (-s ours) am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import translations. DO NOT MERGE 
* commit '5312261de76661827eae1915bcf4d42fa36309b0':
  Import translations. DO NOT MERGE
 2015-04-27 15:33:42 +00:00
Jason Monk
e5f7ba7f74 am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev 
* commit '70c5472fe276bf7a272558450fb87f91f9d286ee':
  Move process stats screen into memory screen.
 2015-04-27 14:53:02 +00:00
Geoff Mendal
e2b5070c10 am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE 
* commit '6d53b90869edf104f4fd78e5c81e146784e164b3':
  Import translations. DO NOT MERGE
 2015-04-27 14:52:14 +00:00
Jason Monk
70c5472fe2 Merge "Move process stats screen into memory screen." into mnc-dev 2015-04-27 14:37:02 +00:00