PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,370 Commits 1 Branch 0 Tags
aa55bf443c4a673a67b0c16cc936526c7fbd3c60
Commit Graph

14370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lifu Tang
aa55bf443c am cc1c788a: am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit 'cc1c788a8aabd73c4ed079987b8b128911131062':
 2014-07-17 18:29:46 +00:00
PauloftheWest
a5f1dddb68 am 43f00110: am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit '43f001100a0e236f0fe96ca6eac8e0c7934cbfd8':
 2014-07-17 18:29:45 +00:00
PauloftheWest
384d0ac294 am 32e77410: am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit '32e77410c7bfba7b584a1ff76f60c8a4639057e0':
 2014-07-17 18:29:44 +00:00
Paul Lawrence
00427bc9f5 am 9d17fc34: am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '9d17fc34a588e51aece465662d8dd3b3a492f8e9':
 2014-07-17 18:29:43 +00:00
Alan Viverette
fcb4092248 am a3fb9cea: am 5427b9a7: Update new TimePicker widget to match Settings theme 
* commit 'a3fb9ceacceafd863c49cc958e9b2eb90f27492e':
  Update new TimePicker widget to match Settings theme
 2014-07-17 18:19:14 +00:00
Fabrice Di Meglio
1fbd1d8e95 am 4f9f25ac: am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '4f9f25ac6ce72fce54e3ae9b786dcadc28805ce4':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 18:19:13 +00:00
Baligh Uddin
aa782832e5 am 28999ebb: (-s ours) am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '28999ebb5feed6fab786fd85cd11975f681ae3c6':
  Import translations. DO NOT MERGE
 2014-07-17 18:19:13 +00:00
Chris Craik
f12b150be5 am 7babd055: Merge "Accessibility text contrast control" into lmp-dev 
* commit '7babd05509ea33f507f3525fbe065093d5877779':
  Accessibility text contrast control
 2014-07-17 18:19:12 +00:00
Andres Morales
c1ddf4e6b5 am 0128374a: Increase oem_unlock_enable char limit for translation 
* commit '0128374aae5f9b748ade7d347fd267969ce726b9':
  Increase oem_unlock_enable char limit for translation
 2014-07-17 18:19:11 +00:00
Fabrice Di Meglio
de2f44c6c5 am b5b35fa1: Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev 
* commit 'b5b35fa1cf8122dca0f10392e6bfb6ee88f1d7f1':
  Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again
 2014-07-17 18:18:05 +00:00
Lifu Tang
7faa77ead0 am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
  Avoid removing switch even listener multiple times
 2014-07-17 18:16:28 +00:00
PauloftheWest
6da8b0c99a am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit 'f3282c500141023508bd1e08fd5cb6913a8e32df':
  Corrected mispelling in strings.xml
 2014-07-17 18:16:27 +00:00
PauloftheWest
18099f716c am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
 2014-07-17 18:16:26 +00:00
Paul Lawrence
a6c75963a3 am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
  Make crypt dialogs material
 2014-07-17 18:16:24 +00:00
Lifu Tang
cc1c788a8a am 569abb0c: Merge "Avoid removing switch even listener multiple times" into lmp-dev 
* commit '569abb0c25708d4e7fc2cb4b3fe08839e253e211':
  Avoid removing switch even listener multiple times
 2014-07-17 17:01:00 +00:00
PauloftheWest
43f001100a am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit 'f3282c500141023508bd1e08fd5cb6913a8e32df':
  Corrected mispelling in strings.xml
 2014-07-17 17:00:59 +00:00
PauloftheWest
32e77410c7 am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
 2014-07-17 17:00:59 +00:00
Paul Lawrence
9d17fc34a5 am 41eb8522: Merge "Make crypt dialogs material" into lmp-dev 
* commit '41eb85226ceaba16a635eb6b9818231008466f24':
  Make crypt dialogs material
 2014-07-17 17:00:58 +00:00
Alan Viverette
a3fb9ceacc am 5427b9a7: Update new TimePicker widget to match Settings theme 
* commit '5427b9a7990d408df1f2231ec649501f848f7d3d':
  Update new TimePicker widget to match Settings theme
 2014-07-17 14:18:35 +00:00
Fabrice Di Meglio
4f9f25ac6c am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '9b435f29d72d3be25c97ae3234ba375df055d09d':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 14:15:47 +00:00
Baligh Uddin
28999ebb5f am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a1ed7f2f77f2518809bd369c236fb1d07fe2db6c':
  Import translations. DO NOT MERGE
 2014-07-17 14:15:46 +00:00
Alan Viverette
5427b9a799 Update new TimePicker widget to match Settings theme 
BUG: 11218747
Change-Id: I093e16df14832502af0ac28e19e3ad672a51e1d6
 2014-07-17 04:36:55 +00:00
Andres Morales
0128374aae Increase oem_unlock_enable char limit for translation 
Bug: 16220494
Change-Id: I3974b241bc57130e518dab4b20348e698a276854
 2014-07-17 01:03:02 +00:00
Fabrice Di Meglio
b5b35fa1cf Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev 2014-07-16 23:42:05 +00:00
Fabrice Di Meglio
a874180fbe Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again 
- regression from 9717fab53d
- add the missing dashboardBackgroundColor attribute to the DialogWhenLarge Themes

Change-Id: I9f7e21d33851966350726e4b3bf79a5a4d12a37f
 2014-07-16 17:02:41 -07:00
Fabrice Di Meglio
9b435f29d7 Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 2014-07-16 23:30:53 +00:00
Fabrice Di Meglio
e817a66e83 Fix bug #15702424 add-wifi setting screen has no title 
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
 2014-07-16 19:51:06 -07:00
Baligh Uddin
a1ed7f2f77 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:30:53 +00:00
Baligh Uddin
c2befed25d Import translations. DO NOT MERGE 
Change-Id: I2e49081933e98dc3109219c21bd737c3e22fd6f7
Auto-generated-cl: translation import
 2014-07-16 18:46:36 -07:00
Chris Craik
7babd05509 Merge "Accessibility text contrast control" into lmp-dev 2014-07-16 22:04:55 +00:00
Chris Craik
fc72424cd7 Accessibility text contrast control 
b/14624452

Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd
 2014-07-16 18:04:26 -07:00
PauloftheWest
b97f2efd88 am 4de66531: am 55245894: Merge "Added strings for PBAP and MultiSim" into lmp-dev 
* commit '4de665314a8443f4b8913bc145f1de43144bc168':
  Added strings for PBAP and MultiSim
 2014-07-16 17:53:11 +00:00
PauloftheWest
4de665314a am 55245894: Merge "Added strings for PBAP and MultiSim" into lmp-dev 
* commit '552458940450d509185a5d6857175f7d606d6366':
  Added strings for PBAP and MultiSim
 2014-07-16 17:50:03 +00:00
Maurice Lam
63d6c905c9 am e6080819: am ca1ad092: Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev 
* commit 'e6080819b046b27a0951dcc6802766c3cf3c30ad':
  [WifiSetup] Make illustration header not clickable
 2014-07-16 17:19:35 +00:00
Maurice Lam
e6080819b0 am ca1ad092: Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev 
* commit 'ca1ad0928064a92b92d72fd1900bde644c398f27':
  [WifiSetup] Make illustration header not clickable
 2014-07-16 17:14:41 +00:00
PauloftheWest
b64a1f2fde Merge "Added Wifi Assistant Card" into lmp-dev 2014-07-16 16:25:13 +00:00
PauloftheWest
060e01a93e Added Wifi Assistant Card 
+ Show Wi-Fi Assistant card above network list that scroll under the action bar with the rest of the list
+ Display a promo image and text
+ Clicking "Setup" should link to the selected Wi-Fi assistant app (must be open to 3rd parties)
+ Touching "No, Thanks" should snooze this card for 30 days / 2nd time 90 / 3rd time 180 days / then forever

Bug: 15703202

Change-Id: If74101bea630246c6bda2de3ed79fee72eca4c0c
 2014-07-16 15:46:09 -07:00
Narayan Kamath
d9124e9344 am 023406a3: am 2abbacb7: Merge "Get rid of duplicated code in accessibility settings." 
* commit '023406a37446630bd4285489e28003834e7f70bc':
  Get rid of duplicated code in accessibility settings.
 2014-07-16 13:13:38 +00:00
PauloftheWest
f3282c5001 Merge "Corrected mispelling in strings.xml" into lmp-dev 2014-07-16 13:12:22 +00:00
PauloftheWest
7a18c4c4ce Corrected mispelling in strings.xml 
Bug: 16345771
Bug: 16337577

Change-Id: I63912c51b5483d4adbfc70668318cd14c344d244
 2014-07-16 16:13:09 -07:00
Narayan Kamath
023406a374 am 2abbacb7: Merge "Get rid of duplicated code in accessibility settings." 
* commit '2abbacb7d46657e5863eb2ef0035521ffc41a0a8':
  Get rid of duplicated code in accessibility settings.
 2014-07-16 13:08:24 +00:00
Alexandra Gherghina
5503427d9f am 6f877156: Merge "Only show AccountSyncSettings when we have an account" into lmp-dev 
* commit '6f877156e0345dc6a70b513e38cd5a32a97783b9':
  Only show AccountSyncSettings when we have an account
 2014-07-16 12:59:52 +00:00
Fabrice Di Meglio
5c66753359 am 7d79e418: Fix OwnerInfos 
* commit '7d79e41877440f8447f92652ce7cdc386b214523':
  Fix OwnerInfos
 2014-07-16 03:04:47 +00:00
Fabrice Di Meglio
1ecfa6e336 am fd1415d2: Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev 
* commit 'fd1415d204e4a11a26fe2d550709c0fe42df46ab':
  Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash
 2014-07-16 03:04:46 +00:00
Jeff Davidson
7d4481dbd0 am eda4acbb: Fix excessively long logtag. 
* commit 'eda4acbb499c7e310bcf5e5465a0f0cd1c773204':
  Fix excessively long logtag.
 2014-07-16 03:04:46 +00:00
Fabrice Di Meglio
7d79e41877 Fix OwnerInfos 
- use a white background for being in line with the Material Theme
- fix padding so that the edge effect is showing full width

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Iea1cf6b104ee8bf5f311f7d3485d0500884dc57a
 2014-07-15 18:55:27 -07:00
Jeff Davidson
eda4acbb49 Fix excessively long logtag. 
Change-Id: Idb0846269623550d891d8e98765d630a17da7d14
 2014-07-16 01:51:55 +00:00
Narayan Kamath
2abbacb7d4 Merge "Get rid of duplicated code in accessibility settings." 2014-07-16 01:07:54 +00:00
Narayan Kamath
26edbccb58 Get rid of duplicated code in accessibility settings. 
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.

bug: 10090157

Change-Id: I20b357c8a3e76c7cecdf623d9ed39c3751d07645
 2014-07-16 12:54:45 +00:00
Alexandra Gherghina
6f877156e0 Merge "Only show AccountSyncSettings when we have an account" into lmp-dev 2014-07-16 00:46:50 +00:00