Commit Graph

21417 Commits

Author SHA1 Message Date
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
e4074ad4b4 am 9a39e082: (-s ours) am d6242009: (-s ours) Import translations. DO NOT MERGE
* commit '9a39e08201ad1cce5d7c844273dbb1ed720a0ab0':
  Import translations. DO NOT MERGE
2015-06-01 14:46:24 +00:00
John Spurlock
48018ddc72 am 08788dcc: am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
* commit '08788dccaf733d855b7a2391095076a642b697f9':
  Settings: Migrate zen event conditions to use calendar name.
2015-06-01 14:46:23 +00:00
The Android Automerger
e7fedeeb0c merge in mnc-release history after reset to mnc-dev 2015-05-31 01:03:46 -07: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
360f69dfa5 am b777c6e2: (-s ours) Import translations. DO NOT MERGE
* commit 'b777c6e20541a01f4219e1020445d091fbfe3217':
  Import translations. DO NOT MERGE
2015-05-30 22:42:32 +00: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
The Android Automerger
bf7e76293a merge in mnc-release history after reset to mnc-dev 2015-05-30 01:06:23 -07: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
Xiyuan Xia
89a0ba67ff am dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev
* commit 'dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef':
  Ignore fp error message when not listening
2015-05-30 03:38:09 +00: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
Xiyuan Xia
dc6bd8d2f1 Merge "Ignore fp error message when not listening" into mnc-dev 2015-05-30 03:28:52 +00: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
Xiyuan Xia
f1bc6e52b5 Ignore fp error message when not listening
Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
2015-05-29 16:19:29 -07:00
Fyodor Kupolov
59e340d735 am 097936ad: Hide guest entry if the user is not allowed to create guest
* commit '097936ad1b6632787127cbefe38373e9696e377d':
  Hide guest entry if the user is not allowed to create guest
2015-05-29 21:42:41 +00:00
Fyodor Kupolov
097936ad1b Hide guest entry if the user is not allowed to create guest
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.

Bug: 19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
2015-05-29 14:07:12 -07: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
8e998b71f0 am 2defc457: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
* commit '2defc457bdd0a13f6ece49a20d5120616ca3eaaf':
  Hide the collapse/expand icon if text fits the screen
2015-05-29 20:52:07 +00:00
Fyodor Kupolov
01f35ce46e Merge "Use DimmableIconPreference for Add user action" into mnc-dev 2015-05-29 20:42:55 +00:00
Fyodor Kupolov
2defc457bd Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev 2015-05-29 20:27:15 +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
Geoff Mendal
9a39e08201 am d6242009: (-s ours) Import translations. DO NOT MERGE
* commit 'd6242009d6f0754083eee1a8d9da7e89bc2d3aec':
  Import translations. DO NOT MERGE
2015-05-29 19:19:32 +00:00
John Spurlock
08788dccaf am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
* commit '00e392387b8989a52e6fc66f14582ae709594852':
  Settings: Migrate zen event conditions to use calendar name.
2015-05-29 19:18:40 +00:00
Fyodor Kupolov
1c8600b0c8 Hide the collapse/expand icon if text fits the screen
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.

Bug: 20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
2015-05-29 11:21:42 -07:00
Maxim Bogatov
838a2f845a Merge "Make whole switchable header act as single Switch for AccessibilityService" 2015-05-29 17:49:36 +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
John Spurlock
00e392387b Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev 2015-05-29 13:22:36 +00:00
John Spurlock
bd352af3cf Settings: Migrate zen event conditions to use calendar name.
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.

Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
2015-05-28 22:20:44 -04:00
Paul Lawrence
5ea9cc81ef am c93ccee5: am a25cf52c: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev
* commit 'c93ccee5e011e58341abe97d6c9d329cb11526ef':
  Disable back button on crypto screen
2015-05-28 22:54:07 +00:00
Paul Lawrence
c93ccee5e0 am a25cf52c: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev
* commit 'a25cf52c7ab590ab0c58d38a742f10d3d37fd63c':
  Disable back button on crypto screen
2015-05-28 22:34:25 +00:00
Tony Mantler
550015e476 Move ZoneGetter into SettingsLib
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
2015-05-28 14:49:19 -07:00
Maxim Bogatov
c99d0a8a79 Make whole switchable header act as single Switch for
AccessibilityService

second part of b/21305287

Change-Id: I80da2ecbc367e10d027a851193f4d03ab8e09c69
2015-05-28 13:20:54 -07:00
Paul Lawrence
a25cf52c7a am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev
* commit '750648c5ae2b975d7aea45601d17f4c0796e8db4':
  Disable back button on crypto screen
2015-05-28 19:53:08 +00:00
Paul Lawrence
750648c5ae Merge "Disable back button on crypto screen" into mnc-dev 2015-05-28 19:37:28 +00:00
Jason Monk
3740563649 am f8adf493: am a5c3cf40: am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
* commit 'f8adf493477f3e18ab55ae2fb9f34f2fd010abc6':
  Make use of WifiTracker's WorkerThread support
2015-05-28 17:46:16 +00:00
Jason Monk
f8adf49347 am a5c3cf40: am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
* commit 'a5c3cf4003ec5314a6fe05fa355e599c80e82469':
  Make use of WifiTracker's WorkerThread support
2015-05-28 17:30:52 +00:00
Jason Monk
a5c3cf4003 am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
* commit '7c3b9f28b5b547fcdfb78d9e24f4d9b694c91c28':
  Make use of WifiTracker's WorkerThread support
2015-05-28 16:48:46 +00:00
Jason Monk
7c3b9f28b5 Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev 2015-05-28 16:37:39 +00:00
Jason Monk
7a0b412ed2 Make use of WifiTracker's WorkerThread support
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.

Bug: 21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
2015-05-28 12:26:09 -04: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
Jason Monk
3430cfbe05 am 266fc6df: am ef4ec260: am 15dcebe1: Help fallbacks and intent work
* commit '266fc6df9420beeedae0c1647e1e05f60e87c7c7':
  Help fallbacks and intent work
2015-05-28 14:49:22 +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
266fc6df94 am ef4ec260: am 15dcebe1: Help fallbacks and intent work
* commit 'ef4ec2603270dac4b7a001220b023721ce3aab54':
  Help fallbacks and intent work
2015-05-28 14:34:07 +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