PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,070 Commits 1 Branch 0 Tags
eb3b52d41147b87dcb46ff04de5486bb96241bdc
Commit Graph

25070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
cde29f771a am 618bc11b: am 72fecf9f: am d3c60afe: Include the usb data mode regardless of data role 
* commit '618bc11b0da63c25e70678d8fadf5f01ca7f13ec':
  Include the usb data mode regardless of data role
 2015-09-10 20:48:48 +00:00
Jason Monk
618bc11b0d am 72fecf9f: am d3c60afe: Include the usb data mode regardless of data role 
* commit '72fecf9f0a640554d9c00e087e4cb2ce8fea3d77':
  Include the usb data mode regardless of data role
 2015-09-10 20:41:37 +00:00
Jason Monk
72fecf9f0a am d3c60afe: Include the usb data mode regardless of data role 
* commit 'd3c60afe5267eb614b9c0a99b797e6bbb51de16f':
  Include the usb data mode regardless of data role
 2015-09-10 20:35:52 +00:00
Jorim Jaggi
69671dafc8 Fix crash in when restoring CredentialCheckResultTracker Fragment 
Bug: 23956504
Change-Id: I884e47a793d6bc00cc0c54fe9e3d4bcf4e0199c1
 2015-09-10 13:35:04 -07:00
Maurice Lam
7d8ebeea94 [ScreenLockSetup] Create separate title string 
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.

Bug: 23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
 2015-09-10 12:05:14 -07:00
Jason Monk
d3c60afe52 Include the usb data mode regardless of data role 
Turns out there are valid data modes in host mode (like midi).
Need to allow these through for the dialog to set the proper
current state.

Bug: 23905770
Change-Id: I7a37ad95ccaf18f211d2b2d330c7f1d7af4cfc16
 2015-09-10 10:38:14 -04:00
Jorim Jaggi
cb9d7a96bb resolved conflicts for 99bbec73 to master 
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
 2015-09-09 18:48:27 -07:00
Jorim Jaggi
99bbec733d am f37368db: am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit 'f37368db841ce534cc1712b54b1c88bcbe991756':
  Add double-tap power button to open camera 2/2
 2015-09-10 01:11:44 +00:00
Maurice Lam
3fac92ff7e Merge "[WifiSetup] Suppress crash during Wi-Fi setup" 2015-09-10 01:03:54 +00:00
Jorim Jaggi
f37368db84 am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit 'ef5f9e3952ac35df4ce4335be0020ae81b11f746':
  Add double-tap power button to open camera 2/2
 2015-09-10 01:02:39 +00:00
Jorim Jaggi
ef5f9e3952 am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit '48422b52f3ed81dd447e6bc836d752f33ef8c7b3':
  Add double-tap power button to open camera 2/2
 2015-09-10 00:53:48 +00:00
Jorim Jaggi
48422b52f3 Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jim Miller
a04ebb412c am eddb0493: am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reache 
* commit 'eddb04934b2b52ab0ff6545515df8f0801f538c0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:22:50 +00:00
Jim Miller
eddb04934b am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRIN 
* commit '93b39ff9bd40df755967a4dfe0593b30b0cfa8d2':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:14:27 +00:00
Jim Miller
93b39ff9bd am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEO 
* commit '01f44efab0673e8648470c8be1670730660a4778':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:08:06 +00:00
Maurice Lam
f402d8ffd7 [WifiSetup] Suppress crash during Wi-Fi setup 
Bug: 23936498
Change-Id: I7d97995cfb3c904aee3fc1baa50ea3dafe7d72ea
 2015-09-09 16:03:00 -07:00
Jim Miller
01f44efab0 am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro 
* commit '179fa5078b6e105e6e01e82c0af7c43745c452b0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:02:34 +00:00
Jim Miller
179fa5078b Merge "Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again." into mnc-dr-dev 2015-09-09 22:53:53 +00:00
Jorim Jaggi
cc1e9f7ce7 Add double-tap power button to open camera 2/2 
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
 2015-09-09 22:40:00 +00:00
Jim Miller
457904634c Handle fp enrollment errors more gracefully 
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.

Fixes bug 23546104
Fixes bug 22708384

Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
 2015-09-09 15:30:40 -07:00
Sungmin Choi
7149a85507 am 605685ce: am 5fc62441: am 9819dcb9: am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '605685ceae58d6a0c920ec4f809cf11cd32c34e1':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 18:32:10 +00:00
Sungmin Choi
605685ceae am 5fc62441: am 9819dcb9: am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '5fc624418c11d8a949c6ab61fa3c0b0bc2fb2d46':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 18:14:08 +00:00
Sungmin Choi
5fc624418c am 9819dcb9: am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '9819dcb93e2ce077e674cf4a25b66c5df341b2f9':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 18:06:25 +00:00
Sungmin Choi
9819dcb93e am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig 
* commit '9fcc7e1b20b890283dfe9a02999f40637d27dbb2':
  Hide or show APNs with type="ims" as CarrierConfig
 2015-09-09 17:58:29 +00:00
Alan Viverette
a49cce4f38 Rename night mode back to Night mode 
Which is technically correct (the best correct) and appropriately
manages user expectations.

Change-Id: Ic1680bc47a0c7953afc01f3c678f19b0755062f4
 2015-09-09 10:27:52 -04:00
Sungmin Choi
9fcc7e1b20 Hide or show APNs with type="ims" as CarrierConfig 
APN with type="ims" is used to attach IMS APN to the modem.
This APN is meaningless and confusing to end users.
Most carriers don't care to show this APN from apn list.
Some carriers want to show this APN from apn list and others don't.
This change hides or shows this as CarrierConfig from the APN list.

Bug: 23770219
Change-Id: Ia632f39401d84e8c63ac96f1c3b12aa3d8d2a4e6
 2015-09-08 17:23:14 -07:00
Jorim Jaggi
7be2804da9 am 2ca86be4: am c0c0bf30: am 5cca5a5a: am b83cbe20: Fix build 
* commit '2ca86be437a76cf94644ca6d838f6a70f7fab287':
  Fix build
 2015-09-08 22:16:53 +00:00
Jorim Jaggi
2ca86be437 am c0c0bf30: am 5cca5a5a: am b83cbe20: Fix build 
* commit 'c0c0bf30095a47b7a82df87b08e4d55bb2105350':
  Fix build
 2015-09-08 22:07:52 +00:00
Jorim Jaggi
c0c0bf3009 am 5cca5a5a: am b83cbe20: Fix build 
* commit '5cca5a5a2c54e3ca64df5a2dc7c7bdf4cecf6507':
  Fix build
 2015-09-08 22:02:24 +00:00
Jorim Jaggi
5cca5a5a2c am b83cbe20: Fix build 
* commit 'b83cbe202bd56cf542d898837474757dca3625f2':
  Fix build
 2015-09-08 21:53:45 +00:00
Jorim Jaggi
b83cbe202b Fix build 
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
 2015-09-08 21:42:17 +00:00
Jorim Jaggi
a353262e0d am 6599eb9a: am 52aca96c: am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '6599eb9af255f1e0406b813d038737d5a3c11942':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:39:53 +00:00
Jorim Jaggi
6599eb9af2 am 52aca96c: am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '52aca96c0bd1a52aab3e42c08b10fed7c5763773':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:36:04 +00:00
Jorim Jaggi
52aca96c0b am 64ea62a3: am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '64ea62a30a416b46ecdb2042e052825b96702012':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:26:38 +00:00
Jorim Jaggi
64ea62a30a am 8c543276: Fix crash in fingerprint settings when rotating 
* commit '8c543276f1dd366bd142ce44a8e3084fddb22971':
  Fix crash in fingerprint settings when rotating
 2015-09-08 21:17:06 +00:00
Jorim Jaggi
8c543276f1 Fix crash in fingerprint settings when rotating 
Fragments always need empty constructors.

Bug: 23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
 2015-09-08 20:43:16 +00:00
Julia Reynolds
ec037c387d Merge "Differentiate battery optimization string." 2015-09-08 17:14:02 +00:00
Julia Reynolds
f08185b8e3 Differentiate battery optimization string. 
Bug: 23585186
Change-Id: If98629c7a3204f2600c9d7d9c257de24e826f085
 2015-09-08 12:49:32 -04:00
Robin Lee
b5e37f1d45 Merge "Show installed user keys in Security Settings" 2015-09-08 16:03:26 +00:00
Geoff Mendal
68a28751a2 am 8375466f: (-s ours) am 593714a8: (-s ours) am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE 
* commit '8375466fe9c0616d3ccdb66bafb135ec5de20cc9':
  Import translations. DO NOT MERGE
 2015-09-07 16:05:03 +00:00
Geoff Mendal
8375466fe9 am 593714a8: (-s ours) am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE 
* commit '593714a8d135f7ddafd2ae369cfd09777afdb8e5':
  Import translations. DO NOT MERGE
 2015-09-07 15:58:42 +00:00
Geoff Mendal
593714a8d1 am f1e6378a: (-s ours) am f1a62026: (-s ours) Import translations. DO NOT MERGE 
* commit 'f1e6378a7e181fadd0ccd007dc7249d7ad250a24':
  Import translations. DO NOT MERGE
 2015-09-07 15:51:05 +00:00
Geoff Mendal
f1e6378a7e am f1a62026: (-s ours) Import translations. DO NOT MERGE 
* commit 'f1a62026b83b54b5f234cd87df66fa32f754c914':
  Import translations. DO NOT MERGE
 2015-09-07 15:42:38 +00:00
Geoff Mendal
f1a62026b8 Import translations. DO NOT MERGE 
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
 2015-09-07 08:35:11 -07:00
Geoff Mendal
76381c3f42 Import translations. DO NOT MERGE 
Change-Id: Ide5e5bf4e5da66bfb8246f90da690f447db2e411
Auto-generated-cl: translation import
 2015-09-07 07:49:54 -07:00
Adam Lesinski
2350b8445c Update implementation to match BatteryStats.Uid 
Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f
 2015-09-06 01:57:58 -07:00
Maurice Lam
8d6975eb25 Merge "Update setup wizard skip dialog strings" 2015-09-04 19:30:26 +00:00
Xiaohui Chen
cb9997fd68 Merge "Remove dead Nsd checkbox" 2015-09-04 17:42:35 +00:00
Xiaohui Chen
1466d901f1 Merge "Cleanup remaining USER_OWNER in Settings" 2015-09-04 17:42:22 +00:00
Maurice Lam
21d27b125f Update setup wizard skip dialog strings 
Change "Don't skip" to "Go back".

Bug: 23764890
Change-Id: I899ce893ddeb1cef94d1733871005fd0356ed475
 2015-09-04 00:36:43 +00:00