Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,911 Commits 1 Branch 0 Tags
8c713fc756ee237cd2cbb088b96f94dea2bbcf25
Commit Graph

15043 Commits

Author SHA1 Message Date
Maurice Lam
76c88ac405 am 96141ef9: am e854138a: am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev 
* commit '96141ef9e9151974fde98d942f1b4e62c1f5ffbd':
  [WifiSetup] Add + icon to Add another network
 2015-06-01 19:13:38 +00:00
Maurice Lam
92b415744e am 2b323344: am bc04d414: am 83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev 
* commit '2b32334400c4bd00026327766e24788d737bb752':
  [WifiSettings] Remove unused Wi-Fi icon
 2015-06-01 19:05:59 +00:00
Maurice Lam
96141ef9e9 am e854138a: am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev 
* commit 'e854138ad1960e5e884c51626d27dc72fcfc3dfa':
  [WifiSetup] Add + icon to Add another network
 2015-06-01 19:02:12 +00:00
Maurice Lam
2b32334400 am bc04d414: am 83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev 
* commit 'bc04d414e31999f05e15f1f3b8e749f8c85a68fc':
  [WifiSettings] Remove unused Wi-Fi icon
 2015-06-01 18:51:01 +00:00
Stuart Scott
b4c2ab8622 am 1925989e: am 47ed6ca0: Network Reset should have a lockdown like Factory Reset. 
* commit '1925989ed9b91a1426a14346a6f687173e98b868':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 18:50:47 +00:00
Maurice Lam
e854138ad1 am 6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev 
* commit '6cd24c687d9bdc2a69796e795fa86d6d95c9b60d':
  [WifiSetup] Add + icon to Add another network
 2015-06-01 18:49:41 +00:00
Maurice Lam
6cd24c687d Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev 2015-06-01 18:40:47 +00:00
Maurice Lam
bc04d414e3 am 83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev 
* commit '83d636a3fbe89131d111085cc68b54e323f09259':
  [WifiSettings] Remove unused Wi-Fi icon
 2015-06-01 17:32:34 +00:00
Maurice Lam
83d636a3fb Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev 2015-06-01 17:17:19 +00:00
Stuart Scott
1925989ed9 am 47ed6ca0: Network Reset should have a lockdown like Factory Reset. 
* commit '47ed6ca004dcfe9498269602b109b1e667fae287':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 16:44:06 +00:00
Stuart Scott
47ed6ca004 Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit 176f512c5a)
 2015-06-01 16:30:48 +00:00
Geoff Mendal
b16d2a0242 Import translations. DO NOT MERGE 
Change-Id: Idf3b09809f2f964abef75349083eb11a2bfc7a8c
Auto-generated-cl: translation import
 2015-06-01 09:09:54 -07:00
Fyodor Kupolov
963da2b1e4 am aeaf219e: am 8a1683f2: am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit 'aeaf219eaebb6c0c541a0f701553ee0225d89794':
  Use DimmableIconPreference for Add user action
 2015-06-01 15:48:20 +00:00
Fyodor Kupolov
aeaf219eae am 8a1683f2: am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit '8a1683f24555803c853c6f86d8dff1355eeaf666':
  Use DimmableIconPreference for Add user action
 2015-06-01 15:27:23 +00:00
Tony Mantler
e0a585bbd2 am 9e05e536: am 55cd8fe3: am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '9e05e536915db3e8e4eee62a99ff2281f871bb85':
  Move ZoneGetter into SettingsLib
 2015-06-01 15:26:05 +00:00
Geoff Mendal
3d8a288b0d Import translations. DO NOT MERGE 
Change-Id: Ie14a6b21aeb33ec1ead9ae9623ff3656fb4d0abe
Auto-generated-cl: translation import
 2015-06-01 08:08:36 -07:00
Tony Mantler
9e05e53691 am 55cd8fe3: am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '55cd8fe3150fb4e7470dbbce58cbbab45373d3e5':
  Move ZoneGetter into SettingsLib
 2015-06-01 14:46:25 +00:00
Geoff Mendal
de6da8fc3f Import translations. DO NOT MERGE 
Change-Id: I422e1a66012e2db14392f32fa7239b78c47ac3b7
Auto-generated-cl: translation import
 2015-05-31 01:23:27 -05:00
Geoff Mendal
b777c6e205 Import translations. DO NOT MERGE 
Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87
Auto-generated-cl: translation import
 2015-05-30 17:28:38 -05:00
Maurice Lam
abaca6627b [WifiSettings] Remove unused Wi-Fi icon 
wifi_signal_light was replaced by wifi_signal (which can take any
color via theme attributes). Remove the unused assets.

Change-Id: If1823f9fa74ddaeb54f4a79a5d42db3b24f723d9
 2015-05-29 20:38:44 -07:00
Maurice Lam
8dc986216c [WifiSetup] Add + icon to Add another network 
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.

Bug: 21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
 2015-05-29 20:34:03 -07:00
Geoff Mendal
955961954f Import translations. DO NOT MERGE 
Change-Id: I121c54898057a92d3079e379d6bb4ec144f34af6
Auto-generated-cl: translation import
 2015-05-29 18:22:09 -05:00
Fyodor Kupolov
8a1683f245 am 01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev 
* commit '01f35ce46e584e0fd699c3330eba564eb6811dc5':
  Use DimmableIconPreference for Add user action
 2015-05-29 20:58:17 +00:00
Fyodor Kupolov
01f35ce46e Merge "Use DimmableIconPreference for Add user action" into mnc-dev 2015-05-29 20:42:55 +00:00
Tony Mantler
55cd8fe315 am 3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '3e7f2b445875ffbbbab2e3586985a247ebaec03a':
  Move ZoneGetter into SettingsLib
 2015-05-29 19:20:49 +00:00
Tony Mantler
3e7f2b4458 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:48 +00:00
Geoff Mendal
d6242009d6 Import translations. DO NOT MERGE 
Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec
Auto-generated-cl: translation import
 2015-05-29 09:22:09 -05:00
Tony Mantler
550015e476 Move ZoneGetter into SettingsLib 
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
 2015-05-28 14:49:19 -07:00
Jason Monk
6e76f98f06 am eb859db1: am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit 'eb859db14fbb0b7050d518edade44409ef213743':
  More memory updates
 2015-05-28 15:05:02 +00:00
Jason Monk
eb859db14f am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit '5ab0c9c9e37d8ca17b2e40ccaf6913149cdd78c2':
  More memory updates
 2015-05-28 14:49:28 +00:00
John Spurlock
00340c334d am 8bdfeadb: am e2b5b7fd: am 9dbd6165: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 
* commit '8bdfeadb273c851232575a07ef74fff5adebfec3':
  Settings: Update icon sizes for zen auto rules.
 2015-05-28 14:49:24 +00:00
John Spurlock
8bdfeadb27 am e2b5b7fd: am 9dbd6165: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 
* commit 'e2b5b7fd98b50f196129264c3304fca4241531a9':
  Settings: Update icon sizes for zen auto rules.
 2015-05-28 14:34:08 +00:00
Jason Monk
5ab0c9c9e3 am a7fe759d: Merge "More memory updates" into mnc-dev 
* commit 'a7fe759de7c021b0d3467c75422acb14c62f90bd':
  More memory updates
 2015-05-28 14:33:50 +00:00
Jason Monk
a7fe759de7 Merge "More memory updates" into mnc-dev 2015-05-28 14:24:35 +00:00
Jason Monk
ab2046aa76 More memory updates 
- Some string changes
 - Make processes in memory details not clickable
 - Put processes in a 'detail' category
 - Hide processes when an app only has 1
 - Add memory item to bottom of app info page

Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
 2015-05-28 10:20:56 -04:00
John Spurlock
e2b5b7fd98 am 9dbd6165: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 
* commit '9dbd616541de32df34562a4ee8cb8ee28757923c':
  Settings: Update icon sizes for zen auto rules.
 2015-05-28 14:18:41 +00:00
John Spurlock
9dbd616541 Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev 2015-05-28 14:11:10 +00:00
John Spurlock
e6f9c110c7 Settings: Update icon sizes for zen auto rules. 
Bug: 21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
 2015-05-28 10:07:29 -04:00
Maurice Lam
a80694d476 am 2991c526: am 08b13b02: am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 
* commit '2991c52600a15205e6ca0aac76e6e5b00149c23a':
  [LockScreen] Setup Wizard pattern lock landscape layout
 2015-05-27 21:01:15 +00:00
Maurice Lam
2991c52600 am 08b13b02: am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 
* commit '08b13b0239e70bcb2268cb7ae1aee090300efe81':
  [LockScreen] Setup Wizard pattern lock landscape layout
 2015-05-27 20:45:50 +00:00
Maurice Lam
08b13b0239 am 6fd26aae: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 
* commit '6fd26aae0d47b6f8ddd472abc8f86cd65c796fda':
  [LockScreen] Setup Wizard pattern lock landscape layout
 2015-05-27 20:23:41 +00:00
Maurice Lam
6fd26aae0d Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev 2015-05-27 18:35:09 +00:00
Xiyuan Xia
4ab225a9e2 am dfba393e: am d82fcc9d: am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 
* commit 'dfba393eada1f46bf53111a5e5deb72d5bc484ff':
  Fix transient Next button in confirm screen on orientation change
 2015-05-27 16:39:12 +00:00
Xiyuan Xia
dfba393ead am d82fcc9d: am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 
* commit 'd82fcc9dfec91d8dda5c12303ed2948dc727cf0e':
  Fix transient Next button in confirm screen on orientation change
 2015-05-27 16:25:07 +00:00
Xiyuan Xia
d82fcc9dfe am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 
* commit '4ae8b37c58350209cd097eff2598aefda2441956':
  Fix transient Next button in confirm screen on orientation change
 2015-05-27 16:07:55 +00:00
Geoff Mendal
fc05d80102 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-27 15:57:53 +00:00
Xiyuan Xia
4ae8b37c58 Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev 2015-05-27 15:54:35 +00:00
Geoff Mendal
61ab32fdc6 Import translations. DO NOT MERGE 
Change-Id: I0a30eee2e063e7246c04a289202d22a9f00dc94e
Auto-generated-cl: translation import
 2015-05-27 08:54:34 -07:00
Geoff Mendal
13026a66a9 Merge "Import translations. DO NOT MERGE" 2015-05-27 15:27:58 +00:00
Geoff Mendal
ae62051650 Import translations. DO NOT MERGE 
Change-Id: Idfa2d231040fa6a39e323518d63e6e39e2ec5a04
Auto-generated-cl: translation import
 2015-05-27 07:56:18 -07:00