PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,963 Commits 1 Branch 0 Tags
9e504d5d2fd2333ef52fa7049fa0f60e59637d9c
Commit Graph

19963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
fb4c4de81d Merge "Require explicit userId in LockPatternUtils" into mnc-dev 2015-04-28 22:09:44 +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
28077b9cc8 Add Pacific/Noumea. 
Also move Majuro to the right place in the list. It's +11, not -11.

(cherry-pick of 23ae8827c1bd86ec632eab42d067148f8b3452e8.)

Bug: http://b/20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
 2015-04-28 13:59:54 -07: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
441ea80d0a 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
(cherry picked from commit 2c2a41669f)
 2015-04-28 19:20:59 +00:00
Adrian Roos
5437588abd Require explicit userId in LockPatternUtils 
Bug: 18931518
Change-Id: Ie2faa18918aaadf17a84287898438549a693b0cc
 2015-04-28 12:01:09 -07:00
Yorke Lee
0b31dc54bf Merge "Simplify DefaultDialerManager" into mnc-dev 2015-04-28 18:58:01 +00:00
Yorke Lee
ec996be27b Simplify DefaultDialerManager 
The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.

Bug: 20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
 2015-04-28 11:35:22 -07:00
John Spurlock
8881120246 Settings: "No interruptions" -> "Total silence" 
Bug: 20064962
Change-Id: I318fc5cf4555cfbbd019a7f012c02ab8cb322f2c
 2015-04-28 15:36:50 +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
Martijn Coenen
fe58b534f6 New Tap & Pay UX. 
Change-Id: Icbffe0f58d2c37d5691357c13a14ab9a40e53249
 2015-04-28 08:17:22 +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
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
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
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
Geoff Mendal
6d53b90869 am d1b9edab: (-s ours) Import translations. DO NOT MERGE 
* commit 'd1b9edab3a71550ff8dc6983cb54cca64f38c0e0':
  Import translations. DO NOT MERGE
 2015-04-27 14:33:25 +00:00
Geoff Mendal
d1b9edab3a Import translations. DO NOT MERGE 
Change-Id: I975ff3310d078dff27ab1d65811cb7026bb968e8
Auto-generated-cl: translation import
 2015-04-27 09:14:56 -05:00
Jason Monk
2583fc1e06 Move process stats screen into memory screen. 
- Move process stats from developer options to top level
   settings item.
 - Some minor UI changes to the top of the page
 - Major UI updates to detail page, now shows info with processes
   as pref categories and services as prefs, with a way to kill
   them (taken from Running Services page).
 - Some major refactorings in code, in attempt to make it more
   usable
 - Added color bar on per app basis to visualize the avg/max
   relationship
 - Updated the way avg is calculated across multiple entries in
   ProcStatsPackageEntry to be more accurate
 - Change the way max memory is calculated in
   ProcStatsPackageEntry to be less accurate but more useful

Bug: 19443802
Change-Id: Ia6aaabe42c415c50997a09bfb814a6f6e5731772
 2015-04-27 10:08:52 -04:00
Geoff Mendal
5312261de7 am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import translations. DO NOT MERGE 
* commit '3eb3af9daabe58ca117d0f8b14f86117d8b96458':
  Import translations. DO NOT MERGE
 2015-04-27 12:48:14 +00:00
Geoff Mendal
3eb3af9daa am c5184ff1: (-s ours) Import translations. DO NOT MERGE 
* commit 'c5184ff1af600d0195532b9b6c37505cc2f863f1':
  Import translations. DO NOT MERGE
 2015-04-27 06:52:05 +00:00
Geoff Mendal
c5184ff1af Import translations. DO NOT MERGE 
Change-Id: I1ac8f78379eb67ddf2f5d6e92825424dd1aeb23a
Auto-generated-cl: translation import
 2015-04-26 18:36:59 -07:00
Geoff Mendal
23562e4605 Import translations. DO NOT MERGE 
Change-Id: I05bb4f3a511b9b620bb9fbcf0a9be40ece9eb0ad
Auto-generated-cl: translation import
 2015-04-25 00:12:23 -07:00
Etan Cohen
a0128ff0bf Merge changes from topic 'mwd-merge-042415' 
* changes:
  Merge commit '377c7c9' into merge2
  Merge commit '22ffff6' into merge2
 2015-04-25 00:51:57 +00:00