Matthew Fritze
e6e81ed3a3
Merge "Prevent empty non-Indexable keys from being added" into oc-dev am: d51b94b042
...
am: 68824ba600
Change-Id: I0e8d2965c10947db09832ee7dfd4d1a4bc8aaa17
2017-05-02 19:45:09 +00:00
Matthew Fritze
68824ba600
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
...
am: d51b94b042
Change-Id: I2b915166c5a52082bfb0c4dff52ea9101f5c2514
2017-05-02 19:29:18 +00:00
TreeHugger Robot
d51b94b042
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
2017-05-02 19:25:53 +00:00
TreeHugger Robot
e2987d7173
Merge "Remove accessibility duplicates in settings search"
2017-05-02 19:07:44 +00:00
Miao Miao (苗苗)
e1e918e4a8
Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
am: c6e3467cc2
am: b1480c8cab
...
am: d0cb54b27e
Change-Id: I7430b38a73cf22b823121db3c2287f3afdb63d79
2017-05-02 17:54:44 +00:00
Miao Miao (苗苗)
d0cb54b27e
Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
am: c6e3467cc2
...
am: b1480c8cab
Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
2017-05-02 17:48:41 +00:00
Miao Miao (苗苗)
b1480c8cab
Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
...
am: c6e3467cc2
Change-Id: If6ad081e117a94df84d041776649af63c392cc30
2017-05-02 17:46:41 +00:00
Miao Miao (苗苗)
c6e3467cc2
Merge "Settings crash when receiving data state broadcast"
...
am: 2ed42d009b
Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
2017-05-02 17:44:08 +00:00
Matthew Fritze
4f198813ed
Prevent empty non-Indexable keys from being added
...
Change-Id: I688cd5243bb1651d60f74e168a84ddf8723816e3
Fixes: 37646265
Test: make RunSettingsRoboTests
2017-05-02 10:42:07 -07:00
Treehugger Robot
2ed42d009b
Merge "Settings crash when receiving data state broadcast"
2017-05-02 17:39:45 +00:00
Matthew Fritze
49915a64c5
Remove accessibility duplicates in settings search
...
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Iae179b558065d728c14eb76f136d398081577779
2017-05-02 17:39:24 +00:00
Kevin Chyn
d361b734a5
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev am: f1f35ee107
...
am: 19323ca297
Change-Id: I64d6590b9e757e99005ce7a3f9f01ad5fd11f5fe
2017-05-02 17:22:40 +00:00
Kevin Chyn
19323ca297
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
...
am: f1f35ee107
Change-Id: I105ef25110a9c7b158c08f61f5e0b4354490218e
2017-05-02 17:16:09 +00:00
TreeHugger Robot
f1f35ee107
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
2017-05-02 17:12:22 +00:00
Daniel Nishi
cbeebe1b6c
Merge "Filter on volume for category storage view." into oc-dev am: a41a190ac3
...
am: 854acc9e4b
Change-Id: I21c985df9ee34981b47c080756df5dc442f335b6
2017-05-02 17:09:37 +00:00
Daniel Nishi
dfcee96122
Merge "Tweak spacing for horizontal preferences." into oc-dev am: b4937f4556
...
am: 88c721116b
Change-Id: I46f64ee45e2dc0941719e9d53abc0f4cba0fa79a
2017-05-02 17:09:08 +00:00
Daniel Nishi
854acc9e4b
Merge "Filter on volume for category storage view." into oc-dev
...
am: a41a190ac3
Change-Id: I967f4fd28c5375f0c56ad88dedc47a484918b629
2017-05-02 17:07:02 +00:00
Daniel Nishi
88c721116b
Merge "Tweak spacing for horizontal preferences." into oc-dev
...
am: b4937f4556
Change-Id: Ida558c9499e49a1498e4469140dc099ef754e093
2017-05-02 17:06:36 +00:00
Daniel Nishi
a41a190ac3
Merge "Filter on volume for category storage view." into oc-dev
2017-05-02 17:03:36 +00:00
Daniel Nishi
b4937f4556
Merge "Tweak spacing for horizontal preferences." into oc-dev
2017-05-02 17:03:13 +00:00
The Android Open Source Project
57fb213856
Merge "Import translations. DO NOT MERGE" into oc-dev am: 23550fdcd3
-s ours
...
am: ad5649043e
-s ours
Change-Id: I079f1dd525e204ec7905550ea0525c1509283066
2017-05-02 16:34:46 +00:00
The Android Open Source Project
ad5649043e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 23550fdcd3
-s ours
Change-Id: I8a79bee09818497cf509369a673377bf623b1fb8
2017-05-02 15:59:49 +00:00
TreeHugger Robot
23550fdcd3
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-02 15:46:55 +00:00
TreeHugger Robot
e9686e3284
Merge "Import translations. DO NOT MERGE"
2017-05-02 15:10:59 +00:00
The Android Open Source Project
e59cd40c54
Import translations. DO NOT MERGE
...
Change-Id: I821c1fc2cd75b141b068160f0a664cc747c36a3f
Auto-generated-cl: translation import
2017-05-02 02:06:19 -07:00
The Android Open Source Project
9a45ec31ba
Import translations. DO NOT MERGE
...
Change-Id: I7759ea372b0386d5a275424525c5fb4b9d283173
Auto-generated-cl: translation import
2017-05-02 01:35:16 -07:00
Kevin Chyn
5e6b804301
Revert "Swipe for notification should be default-on in settings app"
...
This reverts commit a95c2c3a8d
.
Change-Id: I8fcc290be7d373d55058bd7c22f163d54fc03830
2017-05-02 06:49:17 +00:00
Kevin Chyn
cd10e82eba
Merge "Swipe for notification should be default-on in settings app" into oc-dev am: 9ab1318ca8
...
am: f921f8e77e
Change-Id: I3337bcba8a7baa4038f7c72d8eb9658311c0c435
2017-05-02 04:20:45 +00:00
Kevin Chyn
f921f8e77e
Merge "Swipe for notification should be default-on in settings app" into oc-dev
...
am: 9ab1318ca8
Change-Id: Ib153ffcb4012954950f8c1310a5f08efefecc91d
2017-05-02 04:14:47 +00:00
TreeHugger Robot
9ab1318ca8
Merge "Swipe for notification should be default-on in settings app" into oc-dev
2017-05-02 04:09:31 +00:00
Fan Zhang
4844cd878f
Merge "Update vpn icon from setting gear to vpn key." into oc-dev am: 74327fa4f0
...
am: 403a4ee11a
Change-Id: I29538740df4794e0b427f31bc62a4380e40686f3
2017-05-02 02:32:39 +00:00
Fan Zhang
403a4ee11a
Merge "Update vpn icon from setting gear to vpn key." into oc-dev
...
am: 74327fa4f0
Change-Id: Ib711284c7071766d516d5b0e653f1b01da0f13bd
2017-05-02 02:28:10 +00:00
TreeHugger Robot
74327fa4f0
Merge "Update vpn icon from setting gear to vpn key." into oc-dev
2017-05-02 02:23:35 +00:00
Amit Mahajan
02f99d3009
Merge "Change to not call update() if APN is not modified." into oc-dev am: 7cab6a9a17
...
am: bd119a71ec
Change-Id: I477923344d01febc0d78c0264eadfa880d716353
2017-05-02 02:13:41 +00:00
TreeHugger Robot
fd4feaf540
Merge "Add summary text to App permissions settings."
2017-05-02 02:11:50 +00:00
Amit Mahajan
bd119a71ec
Merge "Change to not call update() if APN is not modified." into oc-dev
...
am: 7cab6a9a17
Change-Id: I7ae69ec7797f10e0d48a4ce7d1b3a80c18851911
2017-05-02 02:07:38 +00:00
TreeHugger Robot
9a68befefd
Merge "Framework for the anomaly detection."
2017-05-02 02:03:01 +00:00
TreeHugger Robot
7cab6a9a17
Merge "Change to not call update() if APN is not modified." into oc-dev
2017-05-02 01:59:38 +00:00
Jaekyun Seok
d427f4fef8
Merge "Do not show static overlays as a theme" into oc-dev am: 170acdb79b
...
am: 4a6781af1b
Change-Id: I2f4b1f9ab7e7947bb5c95aae7d7400113e4c266b
2017-05-02 01:24:29 +00:00
Jaekyun Seok
4a6781af1b
Merge "Do not show static overlays as a theme" into oc-dev
...
am: 170acdb79b
Change-Id: I7172c65c195baa356dc6f2dbe1d9793dca51b3fa
2017-05-02 01:15:01 +00:00
TreeHugger Robot
170acdb79b
Merge "Do not show static overlays as a theme" into oc-dev
2017-05-02 01:03:54 +00:00
Jesse Evans
2560e2eacd
Merge "Hides app buttons for instant apps" into oc-dev am: 965508fc3e
...
am: 34e0c7afdf
Change-Id: I8b0624d28b43274465b9249552290fac950e9638
2017-05-02 00:36:34 +00:00
Doris Ling
ffda9c23c4
Add summary text to App permissions settings.
...
Check the granted permissions for the installed app and compose the
summary text to use the first 3 permissions granted from the list:
Location, Microphone, Camera, Sms, Contacts, and Phone.
Change-Id: I61d21f279af2fe86132de22b94e1a49da0225fcd
Fix: 36376411
Test: make RunSettingsRoboTests
2017-05-01 17:36:20 -07:00
Jesse Evans
34e0c7afdf
Merge "Hides app buttons for instant apps" into oc-dev
...
am: 965508fc3e
Change-Id: I6158a7d6f96ea144b16cda70fe1ed9fb989c5d8d
2017-05-02 00:34:02 +00:00
TreeHugger Robot
965508fc3e
Merge "Hides app buttons for instant apps" into oc-dev
2017-05-02 00:29:00 +00:00
Jaekyun Seok
681dd00ae7
Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
am: f8aaf9ecdc
am: 8b5389f707
...
am: 33d77b09a6
Change-Id: I54bc2a2c7d344e12a2a6cfd696263706b33aef8a
2017-05-01 23:22:59 +00:00
Jaekyun Seok
33d77b09a6
Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
am: f8aaf9ecdc
...
am: 8b5389f707
Change-Id: Id42eb0a0ea330c5758e4a77a31158b7dd26256b5
2017-05-01 23:21:06 +00:00
Jaekyun Seok
8b5389f707
Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
...
am: f8aaf9ecdc
Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
2017-05-01 23:17:29 +00:00
Jaekyun Seok
f8aaf9ecdc
Merge "Generate license html file from xml files of partitions"
...
am: 04a7e0a73a
Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
2017-05-01 23:15:34 +00:00
Treehugger Robot
04a7e0a73a
Merge "Generate license html file from xml files of partitions"
2017-05-01 23:08:19 +00:00