PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,147 Commits 1 Branch 0 Tags
c87ea48a616039fccf328aef44aec1ce8045a86c
Commit Graph

23147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
a206a162d1 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 14:09:16 +00:00
Paul Lawrence
f7f0a85fe6 am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard 
* commit '1f8fb0f8ce1e82266a3a12b3d31b9062cff3fc44':
  Stop crash on repeated enters on virtual keyboard
 2015-08-19 14:08:36 +00:00
Geoff Mendal
d401a062c7 Import translations. DO NOT MERGE 
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
 2015-08-19 07:08:00 -07:00
Geoff Mendal
1ca2c0d362 Import translations. DO NOT MERGE 
Change-Id: I45f139d94c0d59401f7438b8913c8bbd1f338e94
Auto-generated-cl: translation import
 2015-08-19 06:14:20 -07:00
Maurice Lam
27fa865db7 [Fingerprint] Smaller enrolling ring 
Make the enrolling progress ring smaller in sw400dp during setup.

Bug: 23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
 2015-08-18 18:30:36 -07:00
Paul Lawrence
1f8fb0f8ce Stop crash on repeated enters on virtual keyboard 
Change https://googleplex-android-review.git.corp.google.com/#/c/742462/
removed the mDone since graying out the button seemed to remove the need
for this. However, you can also enter this command repeatedly from the
soft keyboard.

Put mDone back.

Bug: 23181625
Change-Id: I42e8ecb9824b17825778c9c113130506cc3a200b
 2015-08-18 16:25:00 +00:00
Julia Reynolds
b7237a1457 Index account settings for settings search. 
Bug: 19390455
Change-Id: Ie55c46788b010dc920b06b38008baad3ed37600a
 2015-08-18 10:36:11 -04:00
Julia Reynolds
4ffebed985 am c1682e0a: am 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page. 
* commit 'c1682e0a7270f7805267f7cfaa66a2d22a8d83df':
  String update for battery details page.
 2015-08-17 17:57:03 +00:00
Julia Reynolds
c1682e0a72 am 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page. 
* commit '904a7e96a9c8023cd4a24c73a5f77659b48f04d8':
  String update for battery details page.
 2015-08-17 17:47:29 +00:00
Julia Reynolds
904a7e96a9 am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page. 
* commit 'db4a029f66092ee8497775e434c21fee7dbda486':
  String update for battery details page.
 2015-08-17 17:39:38 +00:00
Julia Reynolds
db4a029f66 am 62fdd558: am 0ece6a32: String update for battery details page. 
* commit '62fdd5581e131731651e4afb96bedd8092ffd9cc':
  String update for battery details page.
 2015-08-17 17:32:26 +00:00
Julia Reynolds
62fdd5581e am 0ece6a32: String update for battery details page. 
* commit '0ece6a3241062842db991ad63add899369ce1853':
  String update for battery details page.
 2015-08-17 17:26:19 +00:00
Chris Wren
3be9b031b2 am e932cf23: am a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev 
* commit 'e932cf23a8e587c32b100e72bc8c9a1c4bb835b7':
  instrument fingerprint settings
 2015-08-17 17:16:08 +00:00
Julia Reynolds
646bee6157 Merge "Add null check when loading restricted profile apps." 2015-08-17 17:15:34 +00:00
Julia Reynolds
0ece6a3241 String update for battery details page. 
Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
 2015-08-17 13:14:38 -04:00
Chris Wren
e932cf23a8 am a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev 
* commit 'a18e6ffe9a3c53daa57d622965f594b56dd559a5':
  instrument fingerprint settings
 2015-08-17 17:09:47 +00:00
Julia Reynolds
d7faba5c25 Add null check when loading restricted profile apps. 
In case the profile is being deleted.
Bug: 22235449

Change-Id: Ia67deb4e578edf79079ddc308b0750327c1ff85d
 2015-08-17 13:09:47 -04:00
Chris Wren
a18e6ffe9a am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev 
* commit '8b98ef6fd80c300e327b9f189ac800492f8cb9f5':
  instrument fingerprint settings
 2015-08-17 17:01:58 +00:00
Chris Wren
8b98ef6fd8 am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev 
* commit '15ff8af7a7cec3c55dde81419b0522fc4adcbeb1':
  instrument fingerprint settings
 2015-08-17 16:52:25 +00:00
Chris Wren
15ff8af7a7 Merge "instrument fingerprint settings" into mnc-dr-dev 2015-08-17 16:47:56 +00:00
Jason Monk
38d1b86e09 am 12a4d031: am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev 
* commit '12a4d0313f8e964b727484448bd9b4ed8af1dc5f':
  Fix Usb-C dialog issues
 2015-08-17 16:26:46 +00:00
Geoff Mendal
281a97fd06 am 4c36f443: (-s ours) am f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE 
* commit '4c36f443a368a0409203612a331cbc928d2485dd':
  Import translations. DO NOT MERGE
 2015-08-17 16:26:28 +00:00
Jason Monk
12a4d0313f am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev 
* commit '51ba8b47f501d5fe5915a997507aba2fc246012e':
  Fix Usb-C dialog issues
 2015-08-17 15:49:39 +00:00
Jason Monk
51ba8b47f5 am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev 
* commit '99df2376a161d1a1328b64dfd2451aeb2c50e532':
  Fix Usb-C dialog issues
 2015-08-17 15:41:16 +00:00
Jason Monk
99df2376a1 am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev 
* commit '9d59a2441ee59b0fe74f49cb12de3af2cab89da1':
  Fix Usb-C dialog issues
 2015-08-17 15:35:45 +00:00
Jason Monk
9d59a2441e Merge "Fix Usb-C dialog issues" into mnc-dr-dev 2015-08-17 15:29:52 +00:00
Geoff Mendal
4c36f443a3 am f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE 
* commit 'f1ad264cf8ee8e0ca2f79c13618f4218bab560b1':
  Import translations. DO NOT MERGE
 2015-08-17 14:27:25 +00:00
Geoff Mendal
f1ad264cf8 am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE 
* commit '7533cd473df2acf79c874f40123865d554434b90':
  Import translations. DO NOT MERGE
 2015-08-17 14:19:03 +00:00
Geoff Mendal
7533cd473d am 3c274207: (-s ours) Import translations. DO NOT MERGE 
* commit '3c27420773e35c753e9d4f0114886a68da953469':
  Import translations. DO NOT MERGE
 2015-08-17 14:12:28 +00:00
Geoff Mendal
3c27420773 Import translations. DO NOT MERGE 
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
 2015-08-17 07:05:00 -07:00
Geoff Mendal
e8a03d224d Import translations. DO NOT MERGE 
Change-Id: I43b55b016758b18892141f67662f8b435212e8ca
Auto-generated-cl: translation import
 2015-08-17 06:16:08 -07:00
Adam Lesinski
516ee46c48 Merge commit 'f34d3111' into manualmerge 
Change-Id: I4bc1b449c4b48b6f295035457b66b95e180c6ddd
 2015-08-14 14:22:48 -07:00
Jeff Sharkey
edf038205e am a334d530: am b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'a334d53025fbbf187f5aad5abf61091f9c994e01':
  Only offer migration between private volumes.
 2015-08-14 21:12:58 +00:00
Julia Reynolds
6987152c47 Merge "Allow admins to remove users." 2015-08-14 20:23:23 +00:00
Julia Reynolds
2ed24d3db6 Merge "Fix crash creating notification lockscreen setting." 2015-08-14 20:20:39 +00:00
Julia Reynolds
32f1fe5b8a Allow admins to remove users. 
(Instead of only letting non-admins do that)

Bug: 23220408
Change-Id: Ia27906eba9217fae104f24d227920782e1a27c5f
 2015-08-14 16:13:10 -04:00
Christopher Tate
07298fbc3e resolved conflicts for merge of b1840567 to master 
Change-Id: Ieb83bd61e624609ce3c339ed0c33c691cb4b38bb
 2015-08-14 13:08:32 -07:00
Adam Lesinski
f34d31110f am b5ca40c6: am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit 'b5ca40c6442c4f30b79dcd202bb9fecc65ba436c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 20:01:51 +00:00
Julia Reynolds
94a5bdcb44 Fix crash creating notification lockscreen setting. 
Bug: 23210434
Change-Id: Ic214b34cb540e226c9e871fcda8432460cf3a46f
 2015-08-14 15:55:08 -04:00
Adam Lesinski
b5ca40c644 am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit '11d1caede255fe9643692974031fb93448adbd97':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:55:05 +00:00
Adam Lesinski
11d1caede2 am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit 'e3ddd117a6bd6f25ea345349fe59be6a4ada3161':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:47:43 +00:00
Chris Wren
1b8d5ffb47 instrument fingerprint settings 
instrument visibility on all fingerprint views
  rename and delete action
  add fingerprint action is implicit in flow

Bug: 22951001
Change-Id: I53f048f479e24754972b801598d5da393ba9d716
 2015-08-14 15:44:16 -04:00
Adam Lesinski
e3ddd117a6 am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 
* commit '3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs
 2015-08-14 19:43:40 +00:00
Adam Lesinski
3cc05c9d7e Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Jeff Sharkey
a334d53025 am b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'b38493cc6c52346edbcb045a67b1f4831a80290e':
  Only offer migration between private volumes.
 2015-08-14 18:47:12 +00:00
Jeff Sharkey
b38493cc6c am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb':
  Only offer migration between private volumes.
 2015-08-14 18:40:03 +00:00
Jeff Sharkey
b0f9e9d49f am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
  Only offer migration between private volumes.
 2015-08-14 18:34:36 +00:00
Jeff Sharkey
82fee7bd0a am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev 
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.
 2015-08-14 18:29:15 +00:00
Jeff Sharkey
b4158f0e15 Merge "Only offer migration between private volumes." into mnc-dev 2015-08-14 18:23:39 +00:00
Chris Tate
b184056727 am 95a3e220: am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev 
* commit '95a3e2200c8e2662999bf2453ca8312d6c5312c0':
  Make "Ask every time" actually work that way
 2015-08-14 17:41:11 +00:00