PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,813 Commits 1 Branch 0 Tags
f693ff9efa2ea0a3ec390fa390090a895b971b8c
Commit Graph

18813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
81c5b3f355 am c18dfd69: am a56714af: am 2d93f36f: Add string for "Connected via Wi-Fi assistant". 
* commit 'c18dfd696e843892ca378319bfc4da60e7c61f3e':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-27 00:00:15 +00:00
Jeff Davidson
c18dfd696e am a56714af: am 2d93f36f: Add string for "Connected via Wi-Fi assistant". 
* commit 'a56714af6ea18d9c4299170644c53e89be025f84':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:52:57 +00:00
Jeff Davidson
a56714af6e am 2d93f36f: Add string for "Connected via Wi-Fi assistant". 
* commit '2d93f36f00226a45adf9ad2f001e599f95e61692':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:46:46 +00:00
Jeff Davidson
2d93f36f00 Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:37:07 -08:00
Matthew Xie
7de119ca69 Check remote device uuids for phone book access permission 
Only give phone book access permission for remote devices that
handle PBAP.
Bug: 18140961

Change-Id: I128f15460b151d7e0a47cd9b4b15dae10ec586c5
 2014-11-26 13:32:48 -08:00
Geoff Mendal
beb57d85f3 am 5b09205c: (-s ours) am 237dbc45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '5b09205cc6576ab75e4b9827638044e42f746a7d':
  Import translations. DO NOT MERGE
 2014-11-26 19:56:51 +00:00
Geoff Mendal
089f4400c9 am 944c58a6: (-s ours) am 6ab687e1: (-s ours) am 645cf17f: (-s ours) Import translations. DO NOT MERGE 
* commit '944c58a6bd6858627e4ed8619d06c96c72481ca8':
  Import translations. DO NOT MERGE
 2014-11-26 19:56:50 +00:00
Maurice Lam
66e911fb02 am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 
* commit 'edfc6a0a5fb4d371272e4b4c80de22c4ff346214':
  [Setup] Theme ChooseLockGeneric for setup wizard
 2014-11-26 19:56:48 +00:00
Fabrice Di Meglio
2823eb81f5 am 7a9494d5: am e0658dda: am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 
* commit '7a9494d53e908cf340eb02351981e191afc778af':
  IllegalStateException fixed in print service settings
 2014-11-26 19:56:47 +00:00
Geoff Mendal
5b09205cc6 am 237dbc45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '237dbc45c6558f6d93495f3580606f1a7cbf36b8':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:15 +00:00
Geoff Mendal
944c58a6bd am 6ab687e1: (-s ours) am 645cf17f: (-s ours) Import translations. DO NOT MERGE 
* commit '6ab687e1ee0d99b6a3cdd6270eebcb24dfb7795a':
  Import translations. DO NOT MERGE
 2014-11-26 18:44:11 +00:00
Maurice Lam
edfc6a0a5f am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 
* commit '628e89e94580cd0734fe9aa85065e58021e8e9d8':
  [Setup] Theme ChooseLockGeneric for setup wizard
 2014-11-26 18:42:34 +00:00
Fabrice Di Meglio
7a9494d53e am e0658dda: am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 
* commit 'e0658ddafe8a73a551fc8626a96db07c9e905536':
  IllegalStateException fixed in print service settings
 2014-11-26 18:41:28 +00:00
John Spurlock
04b2e7957d Settings: Restart volumizers explicitly on resume. 
onBindView is no longer called in all cases, so use
onResume as an additional signal that the user returned
to the settings page.  onActivityStop is called in both
cases to cleanup.

Bug: 17461564
Change-Id: I73a6775260951d4fd82ca8c3d8eb852f8dcc7452
 2014-11-26 11:08:43 -05:00
Geoff Mendal
237dbc45c6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-26 14:57:46 +00:00
Geoff Mendal
6ab687e1ee am 645cf17f: (-s ours) Import translations. DO NOT MERGE 
* commit '645cf17f68bbf8580d9cc01a0527445c1c78e74d':
  Import translations. DO NOT MERGE
 2014-11-26 14:50:01 +00:00
Geoff Mendal
f9154eef73 Import translations. DO NOT MERGE 
Change-Id: I36312c2e5f3bf38ba107336920aae2083e75d0bb
Auto-generated-cl: translation import
 2014-11-26 06:49:26 -08:00
Geoff Mendal
6c9140f030 Import translations. DO NOT MERGE 
Change-Id: Id6429feb2f156602b611e6578f624f30ff1997b7
Auto-generated-cl: translation import
 2014-11-26 06:38:44 -08:00
Geoff Mendal
645cf17f68 Import translations. DO NOT MERGE 
Change-Id: Ic5aaf08bc81e92023a18aafa0e5dde54adf8ea05
Auto-generated-cl: translation import
 2014-11-26 06:25:44 -08:00
Maurice Lam
628e89e945 am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 
* commit '3f9d8b60ca9d3815736a4e11d17565fe18524a28':
  [Setup] Theme ChooseLockGeneric for setup wizard
 2014-11-26 01:46:27 +00:00
Maurice Lam
3f9d8b60ca Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 2014-11-26 01:15:36 +00:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard 
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
 2014-11-25 16:52:10 -08:00
Fabrice Di Meglio
e0658ddafe am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 
* commit '09d276371560a8e20e80a7f05a6807b5b8f0ace3':
  IllegalStateException fixed in print service settings
 2014-11-26 00:37:43 +00:00
Fabrice Di Meglio
09d2763715 Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 2014-11-26 00:31:50 +00:00
Fabrice Di Meglio
5de7509927 am d5a4dae8: am c5aa905a: Merge "IllegalStateException fixed in print service settings" 
* commit 'd5a4dae8d8f16a42c32b4c0e63e4b1abbe7374e5':
  IllegalStateException fixed in print service settings
 2014-11-25 23:26:59 +00:00
Fabrice Di Meglio
d5a4dae8d8 am c5aa905a: Merge "IllegalStateException fixed in print service settings" 
* commit 'c5aa905a31e48fdeb52a8591ebb018ff161d57ad':
  IllegalStateException fixed in print service settings
 2014-11-25 23:23:16 +00:00
Fabrice Di Meglio
c5aa905a31 Merge "IllegalStateException fixed in print service settings" 2014-11-25 23:12:38 +00:00
Raju Yadav
21dba1f0e7 IllegalStateException fixed in print service settings 
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).

Change-Id: I96052f95689ae17dd1b4e9d1c313100b7b47a599
 2014-11-25 15:08:14 -08:00
PauloftheWest
256d83dc7a Remove extraneous SIM status information 
Bug: 18467248
Change-Id: I59aff3f979f76ca622a6a9e944398042f236f0b7
 2014-11-25 12:36:40 -08:00
PauloftheWest
ae680e3c67 Fixed a Wi-Fi dialog crash 
Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
 2014-11-25 12:27:07 -08:00
Adrian Roos
b00bf5b690 am 9fc6bf3f: am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev 
* commit '9fc6bf3f3776fae1bcb8175b61e2c38744941312':
  Don't show RedactionInterstitial when changing password
 2014-11-25 18:57:18 +00:00
Adrian Roos
9fc6bf3f37 am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev 
* commit 'b3e88b6e209992b5ce8dabfb95bb5dfb6aa79425':
  Don't show RedactionInterstitial when changing password
 2014-11-25 18:45:43 +00:00
Lucky Zhang
a162bd7651 am e289815e: am 1d556fcc: am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 
* commit 'e289815ec02d30e9fe47197141efe141b68f6ba8':
  [WifiSetup] Wifi setup text wrapping problem
 2014-11-25 17:49:55 +00:00
Geoff Mendal
6fdf6183d8 am 02846117: (-s ours) am 4eed13ca: (-s ours) am faf1dd20: (-s ours) Import translations. DO NOT MERGE 
* commit '028461176c44933737b19397b42b91cbed9cc08f':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:53 +00:00
Geoff Mendal
61860cb16f am dfa717d7: (-s ours) am 709b12c1: (-s ours) Import translations. DO NOT MERGE 
* commit 'dfa717d788188abf3966109815f06277d45d6654':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:52 +00:00
Lucky Zhang
e289815ec0 am 1d556fcc: am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 
* commit '1d556fcca25a68e35536e3d668bfb24bd2b62d0d':
  [WifiSetup] Wifi setup text wrapping problem
 2014-11-25 17:39:04 +00:00
Geoff Mendal
028461176c am 4eed13ca: (-s ours) am faf1dd20: (-s ours) Import translations. DO NOT MERGE 
* commit '4eed13cad112e6ae99464e561b43d14ae6cdbee8':
  Import translations. DO NOT MERGE
 2014-11-25 17:37:26 +00:00
Geoff Mendal
dfa717d788 am 709b12c1: (-s ours) Import translations. DO NOT MERGE 
* commit '709b12c1bafe670146b19f5f911679db7f11e116':
  Import translations. DO NOT MERGE
 2014-11-25 17:37:21 +00:00
Paul Crowley
15ad1bd3b0 am 1abdd7c9: am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 
* commit '1abdd7c98137b9b1c4172f2247a2cae37117b262':
  Reduce number of attempts before factory reset to 30.
 2014-11-25 15:21:44 +00:00
Selim Cinek
bde3966a82 am 51a36c67: am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev 
* commit '51a36c67666abd40188fdd182192a78c436c349e':
  Fixed build breakage due to api change.
 2014-11-25 15:21:43 +00:00
Zoltan Szatmary-Ban
0dccb9091b am 7a2e5f1b: am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 
* commit '7a2e5f1b0370ce2f84b298659d3220ae592b1f74':
  Stop background processes if TrustedCredentialSettings fragment gets detached
 2014-11-25 15:21:41 +00:00
Paul Crowley
1abdd7c981 am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 
* commit '7bd7823758fa88c295858466a0ffd5f5468a1452':
  Reduce number of attempts before factory reset to 30.
 2014-11-25 15:08:33 +00:00
Selim Cinek
51a36c6766 am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev 
* commit '2a65b1b105b6b1b0ea8f8b82df6833f2eadca5bd':
  Fixed build breakage due to api change.
 2014-11-25 15:08:14 +00:00
Zoltan Szatmary-Ban
7a2e5f1b03 am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 
* commit '4a30d627a25f2e6cf3d699c4949919aae7ca7063':
  Stop background processes if TrustedCredentialSettings fragment gets detached
 2014-11-25 15:08:02 +00:00
Adrian Roos
b3e88b6e20 am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev 
* commit '647f9752ce1bdd4c02cd44028dac769369140764':
  Don't show RedactionInterstitial when changing password
 2014-11-25 15:04:25 +00:00
Adrian Roos
647f9752ce Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev 2014-11-25 15:00:00 +00:00
PauloftheWest
c80b7616ca Added color to Data Usage graph 
+ Fixed some issues with displaying multiple SIMs in Data Usage.

Bug: 18466592
Bug: 18291246
Change-Id: I77417be995761ce62e464c7d21a34af1334aac17
 2014-11-25 04:58:22 -08:00
Raju Yadav
7468085405 IllegalStateException fixed in print service settings 
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).

Change-Id: If9c76fe3ff040c295f0af9c092e8824b9a1371d7
 2014-11-25 13:26:42 +01:00
Lucky Zhang
1d556fcca2 am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 
* commit '74896d6f1d6e2b5507f3e1b2c6d40d6ae1bfde37':
  [WifiSetup] Wifi setup text wrapping problem
 2014-11-24 20:01:20 +00:00
Lucky Zhang
74896d6f1d Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 2014-11-24 19:33:13 +00:00