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

14343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Alexandra Gherghina
defdfc54bb Only show AccountSyncSettings when we have an account 
Also removes useless list of accounts

Bug: 16295803
Change-Id: Ida3c1846327874af9f97695a485b12ec689fd343
 2014-07-16 13:27:26 +01:00
Chris Wren
80898f0618 am 62a8aa7a: Merge "Implement application-level high priority setting." into lmp-dev 
* commit '62a8aa7ac90ad28e8f524011480b8b379d0bb50a':
  Implement application-level high priority setting.
 2014-07-15 22:03:32 +00:00
Lifu Tang
569abb0c25 Merge "Avoid removing switch even listener multiple times" into lmp-dev 2014-07-15 20:35:01 +00:00
Lifu Tang
42fa973457 Avoid removing switch even listener multiple times 
- Fix b/16118646

Change-Id: I36cdc5c8d98dfb63924737af40efff35b9ca2e66
 2014-07-16 23:12:03 +00:00
Paul Lawrence
41eb85226c Merge "Make crypt dialogs material" into lmp-dev 2014-07-15 20:35:01 +00:00
Paul Lawrence
89c7570dd4 Make crypt dialogs material 
White on black material theme
Center text
Remove fade to black task
Fix emergency call button

Note - does not implement all requirements of frames in the defect. More
to follow.

Bug: 15328359
Change-Id: I878e59dccffff366ba2484bb77482e168cbd2b81
 2014-07-16 08:07:35 -07:00
PauloftheWest
5524589404 Merge "Added strings for PBAP and MultiSim" into lmp-dev 2014-07-15 20:35:01 +00:00
PauloftheWest
95619db072 Added strings for PBAP and MultiSim 
Bug: 16345619
Change-Id: If7165312723316d5fd90a441562617e03023b015
 2014-07-16 10:38:44 -07:00
Maurice Lam
ca1ad09280 Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev 2014-07-15 20:35:01 +00:00
Maurice Lam
5aee7d5c68 [WifiSetup] Make illustration header not clickable 
No more "pop" sound when the illustration is tapped on.

Bug: 16331851
Change-Id: Ib528e1d6f669f71e0c2f24164726cee47b06700b
 2014-07-15 18:24:18 -07:00
Fabrice Di Meglio
fd1415d204 Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev 2014-07-15 20:35:01 +00:00
Fabrice Di Meglio
1b18665dbc Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash 
- fix the way we are passing switchBarMarginStart / switchBarMarginEnd

Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1
 2014-07-15 18:52:37 -07:00
PauloftheWest
e60b6a8c18 am 97ed6faa: Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev 
* commit '97ed6faa702201d2173bf2199805659080b83112':
  Changed text "NFC & More" to "More" and other minor text changes
 2014-07-15 17:05:53 +00:00
PauloftheWest
0a0f2a5876 am d74c8121: (-s ours) Merge "Adding strings for Call Manager do not merge" into lmp-dev 
* commit 'd74c8121407960d9821de9bff899977fd4db6763':
  Adding strings for Call Manager do not merge
 2014-07-15 17:05:52 +00:00
PauloftheWest
24377a2780 am 55edbae8: Numerous additional strings needed for translation. 
* commit '55edbae88f3dca9da9b3de676a62ddd614f9a291':
  Numerous additional strings needed for translation.
 2014-07-15 17:05:52 +00:00
Christoph Studer
764c81d9eb am bc188907: Merge "NotificationStation: Fix crash, use dark theme" into lmp-dev 
* commit 'bc1889071ff0ecfe79cbc070b57c3301863cf26d':
  NotificationStation: Fix crash, use dark theme
 2014-07-15 17:05:51 +00:00
Chris Wren
62a8aa7ac9 Merge "Implement application-level high priority setting." into lmp-dev 2014-07-15 16:05:17 +00:00
PauloftheWest
55edbae88f Numerous additional strings needed for translation. 
Bug: 16288110
Change-Id: I0701f90f4444700a12f68a2f44598326e94a08ec
 2014-07-15 07:27:24 -07:00
Tadashi G. Takaoka
d30ac9307b am fc820246: (-s ours) (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops 
* commit 'fc8202463e64d9e85af3c99c1d8552d4bb74b7dc':
  (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops
 2014-07-15 03:12:40 +00:00
Tadashi G. Takaoka
2173d050b7 am 989c364f: (-s ours) (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit 
* commit '989c364f2de3eeb2c92fa6713b8e0f137e8d971a':
  (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit
 2014-07-15 03:05:26 +00:00
Tadashi G. Takaoka
fc8202463e (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops 
Change-Id: I1b7d26c37293e03dc20f87d60eb146017a574c47
(cherry picked from commit 61d97ddda8)
 2014-07-15 02:51:57 +00:00
Tadashi G. Takaoka
989c364f2d (DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit 
Change-Id: Id91b62ed084f98e3a6dc724aac9d926d89a96201
(cherry picked from commit a5db65fe11)
 2014-07-15 02:49:36 +00:00
Russell Brenner
94364f9c16 am 6ecd6aa8: Merge "Setup Wizard string refresh" into lmp-dev 
* commit '6ecd6aa8cba6b6b578606a1aa274e6960b7f0b79':
  Setup Wizard string refresh
 2014-07-15 02:35:41 +00:00
Amith Yamasani
82ed2f5c68 am 04b550e2: Merge "Handle android.settings.HOME_SETTINGS intent" into lmp-dev 
* commit '04b550e27a6fb22bf967be43f6e2b741e9ddd67c':
  Handle android.settings.HOME_SETTINGS intent
 2014-07-15 02:35:40 +00:00
Russell Brenner
6ecd6aa8cb Merge "Setup Wizard string refresh" into lmp-dev 2014-07-15 00:41:06 +00:00
Russell Brenner
dbe1283da0 Setup Wizard string refresh 
Update strings from UX flows in time for string freeze deadline.

Bug: 16299032
Change-Id: I37e8ccc7197ff08d5f7eba835276c745f13e5487
 2014-07-15 01:10:53 +00:00
PauloftheWest
97ed6faa70 Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev 2014-07-15 00:22:01 +00:00