PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,767 Commits 1 Branch 0 Tags
83e85cadd8a4df1cf5f18ef3b05214adbd50aa4c
Commit Graph

36767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Sapperstein
83e85cadd8 Merge "Revert "Add search bar to SearchActivity."" into oc-dev am: 37f87b6c64 
am: 93adcee630  -s ours

Change-Id: I6871d37124fb138b50d486764f32af9b14bb5521
 2017-06-06 19:11:03 +00:00
Andrew Sapperstein
93adcee630 Merge "Revert "Add search bar to SearchActivity."" into oc-dev 
am: 37f87b6c64

Change-Id: Icbdb586e3e1a35c004298f50a57812e50ee73eea
 2017-06-06 19:00:04 +00:00
TreeHugger Robot
37f87b6c64 Merge "Revert "Add search bar to SearchActivity."" into oc-dev 2017-06-06 18:42:25 +00:00
Matthew Fritze
84ef9daa4f Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev am: b8028f63ec 
am: 64736b6ae1

Change-Id: I7267309d17ae503144eb11789888937af6c8a0e1
 2017-06-06 18:13:41 +00:00
Matthew Fritze
64736b6ae1 Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev 
am: b8028f63ec

Change-Id: I47066c45b6ee286a2f1eac5ba1d57a5de058652c
 2017-06-06 17:58:30 +00:00
Daniel Nishi
3be2832cfa Merge "Band aid to fix overly long text in donut." into oc-dev am: b5abb2c1d2 
am: 0be5066922

Change-Id: Icf83d3412e0c87c5dbcb98156c0310a6db5b7645
 2017-06-06 17:46:33 +00:00
TreeHugger Robot
b8028f63ec Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev 2017-06-06 17:44:23 +00:00
Matthew Fritze
7e6bc2807f Merge "Update the no-results icon in settings search" into oc-dev am: 02e360dbc9 
am: 3a7f413468

Change-Id: I021c720d4a70af6e07d9de034cbc09c2b4fceeff
 2017-06-06 17:40:32 +00:00
Daniel Nishi
0be5066922 Merge "Band aid to fix overly long text in donut." into oc-dev 
am: b5abb2c1d2

Change-Id: I8bd8b052cd8c437dd858a459c8098e39878b4b50
 2017-06-06 17:40:04 +00:00
Matthew Fritze
3a7f413468 Merge "Update the no-results icon in settings search" into oc-dev 
am: 02e360dbc9

Change-Id: Ic77a5d965bfb882d128182f3eaff5e0c857dd500
 2017-06-06 17:34:31 +00:00
Daniel Nishi
b5abb2c1d2 Merge "Band aid to fix overly long text in donut." into oc-dev 2017-06-06 17:34:01 +00:00
Andrew Sapperstein
61353aa4fd Revert "Add search bar to SearchActivity." 
This reverts commit fac61b71e5.

Bug: 37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
 2017-06-06 17:29:41 +00:00
TreeHugger Robot
02e360dbc9 Merge "Update the no-results icon in settings search" into oc-dev 2017-06-06 17:25:57 +00:00
Matthew Fritze
ed761c4e74 Revert "Revert "Revert "Replace dynamic summary text for SettingPref""" 
This reverts commit c1e9f8787f.

Reason for revert: There is an issue when dropdown menu text has a '%' sign in it.
Despite testing it on my own devices, the bug did not show up immediately.

Instead of continuing down this path for OC, we'll just revert
this patch, and then as an ugly, band-aid solution, check the
summary text for the "%s" substring, and hide it when found.
In O-DR onward, we'll look for a more permanent solution.

Change-Id: Ia7a04bfb7b09c436dc0f13564f2134a1f0c436e2
Bug: 36101902
Fix: 62211676
 2017-06-06 17:20:30 +00:00
TreeHugger Robot
c3ff66e490 Merge "Prevent showing multiple keyguard dialog in vpn setup UI" 2017-06-06 17:17:06 +00:00
Bill Yi
70acb67771 Merge "Import translations. DO NOT MERGE" into oc-dev am: 11465af11e -s ours 
am: d650629364  -s ours

Change-Id: I9a4dd50058845bfb7db289ebeda520b4267aa828
 2017-06-06 16:34:19 +00:00
Bill Yi
d650629364 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 11465af11e  -s ours

Change-Id: I398b4773e26cb34a1ce6304d91b52df32a11e821
 2017-06-06 16:28:22 +00:00
TreeHugger Robot
11465af11e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-06 16:17:44 +00:00
TreeHugger Robot
e952333630 Merge "String changes" 2017-06-06 15:16:06 +00:00
Salvador Martinez
bf35714ff2 Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev am: a8e887be86 
am: 4eb906a672

Change-Id: I48ee59ed5c626496de4bda51f26e25647c3cc16d
 2017-06-06 15:04:52 +00:00
jackqdyulei
7f04c81fe3 Merge "Make footer preferences non-clickable by default" into oc-dev am: 8fbb0bc1f2 
am: 0686f63083  -s ours

Change-Id: I0877907fbfc1b8dd43d18d381ee5115150466ca8
 2017-06-06 15:04:09 +00:00
Lorenzo Colitti
acb76030de Merge changes I23540440,I67269e1a into oc-dev am: 4249a7092b 
am: 844c385c09

Change-Id: I258837998e0c242d4c4dd4fb7c69da8049837173
 2017-06-06 13:54:56 +00:00
Yohann Roussel
89fea15a84 resolve merge conflicts of 1104b94dbc to master 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I537fb871134f801ec9489b48fe748b525e5a65ea
 2017-06-06 12:06:45 +00:00
TreeHugger Robot
e95b730c4f Merge "Ensure wifi ssid cannot exceed 32 bytes." 2017-06-06 06:33:49 +00:00
TreeHugger Robot
f4c91d32d5 Merge "Add help url placeholders for new pages" 2017-06-06 06:20:48 +00:00
Salvador Martinez
4eb906a672 Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev 
am: a8e887be86

Change-Id: I561cd90ba74a551a44d43a04a1b567efc74e4863
 2017-06-06 04:35:19 +00:00
Salvador Martinez
a8e887be86 Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev 2017-06-06 04:29:32 +00:00
Fan Zhang
cd9836c441 Revert "Remove dynamic summary from Security Patch info" 
The change breaks build

Bug: 62359766
Bug: 36101902

This reverts commit 2b562f84b6.

Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
 2017-06-06 04:20:15 +00:00
Fan Zhang
89dc1d1ee2 Revert "Remove dynamic summary from Security Patch info" 
The change breaks build

Fix: 62359766
Bug: 36101902

This reverts commit 2b562f84b6.

Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
 2017-06-06 04:13:04 +00:00
jackqdyulei
0686f63083 Merge "Make footer preferences non-clickable by default" into oc-dev 
am: 8fbb0bc1f2

Change-Id: Idd493f97773816dc4cc1c759bc5465a2b7f4b04f
 2017-06-06 02:05:09 +00:00
TreeHugger Robot
641dfa348f Merge "Import translations. DO NOT MERGE" 2017-06-06 02:04:23 +00:00
TreeHugger Robot
90ef8cea69 Merge "Add ability to see both battery estimates on long press" 2017-06-06 01:58:17 +00:00
TreeHugger Robot
8fbb0bc1f2 Merge "Make footer preferences non-clickable by default" into oc-dev 2017-06-06 01:54:00 +00:00
TreeHugger Robot
5bf8d87454 Merge "Add a new Bluetooth device details page" 2017-06-06 01:28:54 +00:00
Lorenzo Colitti
844c385c09 Merge changes I23540440,I67269e1a into oc-dev 
am: 4249a7092b

Change-Id: Ic8383cce733c5767b133af0e9f85e213e0c36018
 2017-06-06 01:27:32 +00:00
Doris Ling
c6a282183b Remove call to WifiManager.setWifiApEnabled(). am: f38ed2fbb2 
am: 802db8a844

Change-Id: If6e76b06e014d2c3e3eadf60c4bc2ff8e6a50607
 2017-06-06 01:24:38 +00:00
Lorenzo Colitti
4249a7092b Merge changes I23540440,I67269e1a into oc-dev 
* changes:
  When validation state changes, update the AP summary.
  Minor tweaks to WifiDetailPreferenceControllerTest.
 2017-06-06 01:22:08 +00:00
Doris Ling
1104b94dbc Merge "Also update flip camera settings for managed profile." into oc-dev 
am: 051a83d909

Change-Id: I4ba1750948815233ef6a963ddde1ca0bd33bcdec
 2017-06-06 01:15:51 +00:00
Doris Ling
802db8a844 Remove call to WifiManager.setWifiApEnabled(). 
am: f38ed2fbb2

Change-Id: I255679d0eaeaa94d2ac6e5caddf4c6f5a5581bc1
 2017-06-06 01:15:10 +00:00
TreeHugger Robot
051a83d909 Merge "Also update flip camera settings for managed profile." into oc-dev 2017-06-06 01:12:29 +00:00
Matthew Fritze
6fa75da66d Update the no-results icon in settings search 
Bug: 36597112
Test: Open settings, search for 'battle toads', and see the no results icon
Change-Id: I7196114ecaf733747237202d30dd1b47ad37d97e
 2017-06-05 17:53:14 -07:00
Fan Zhang
ab0a0c8202 Prevent showing multiple keyguard dialog in vpn setup UI 
Change-Id: If3a0d4ee285bfdde5f4b84bee58d62708071fe75
Fix: 37552190
Test: make RunSettingsRoboTests
 2017-06-05 17:42:53 -07:00
TreeHugger Robot
a1f10d2888 Merge "Update support strings in Settings" 2017-06-06 00:01:30 +00:00
Doris Ling
fed8ea8bce Also update flip camera settings for managed profile. 
When user update the setting for flip camera, check if there is managed
profile for the user, and update the setting for the managed user id as
well, so that the work profile camera app can read the correct setting
value.

Change-Id: I757041289329870311bc8473b19fd49ecdd0fadb
Fix: 62078588
Test: make RunSettingsRoboTests
 2017-06-05 16:27:12 -07:00
Salvador Martinez
f4727ea07f Add ability to see both battery estimates on long press 
If the enhanced estimate is being used in battery settings
it is now possible to long press on the text to have it display
both instead of the string that is normally used.

Adds another loader to enable this since it needs both the old
and the new estimates simultaneously.

Feature is hidden behind a feature flag that only googlers will
have enabled.

Test: robotests
Bug: 38399275
Change-Id: I5caf26513baada27efd50ddb0e72d3868da47150
 2017-06-05 16:26:32 -07:00
Fan Zhang
cc07043497 Ensure wifi ssid cannot exceed 32 bytes. 
Change-Id: I5c2c50ca8599f6843da47c01b9a0447e2c85d763
Fix: 36898746
Test: make RunSettingsRoboTests
 2017-06-05 16:21:09 -07:00
Doris Ling
f38ed2fbb2 Remove call to WifiManager.setWifiApEnabled(). 
- replace it with ConnectivityManager.stopTethering() instead.

Change-Id: I112863b1be37c0fef5d59c16d73f0c6cf71c6dea
Fix: 62191978
Test: make RunSettingsRoboTests
 2017-06-05 23:00:46 +00:00
Salvador Martinez
bbf6cb7b94 Update support strings in Settings 
String change CL for support strings in settings.

Test: image attached, robotests still pass
Bug: 62145221
Change-Id: Ib10998374be961e42ab6994a7b32e521c49c4652
 2017-06-05 15:17:20 -07:00
TreeHugger Robot
5999ea8f15 Merge "Move UsageGraph from SettingsLib to Settings." 2017-06-05 22:13:52 +00:00
TreeHugger Robot
0c5e3854bd Merge "Bluetooth: Always scan while on pairing or DevicePicker page" 2017-06-05 22:11:42 +00:00