Commit Graph

39313 Commits

Author SHA1 Message Date
TreeHugger Robot
2f8c398165 Merge "Move LogPersist to SettingsLib" 2017-08-07 18:50:43 +00:00
Beverly
90da133162 Merge "Uninstall app through notif closes app settings." into oc-mr1-dev am: 7fc4dd7e7b
am: 793e3641c0

Change-Id: I3befb0c6aa9911600d3f959748702a57cc899985
2017-08-07 17:27:17 +00:00
Beverly
793e3641c0 Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
am: 7fc4dd7e7b

Change-Id: Ie989acfd2f7896a1160cac32f5e379112737028a
2017-08-07 17:21:53 +00:00
TreeHugger Robot
7fc4dd7e7b Merge "Uninstall app through notif closes app settings." into oc-mr1-dev 2017-08-07 17:16:06 +00:00
Matthew Fritze
108c4a490e Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours am: f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
am: ab0fa22e71  -s ours

Change-Id: I6114e3774724de20be3cf3212070afca0ad17ac1
2017-08-07 17:09:08 +00:00
Matthew Fritze
d780e6c06e Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 am: d1b29a4350 -s ours
am: 4023fdd48d  -s ours

Change-Id: I1b1ed19fded781288ee7264d5b190cb09a979882
2017-08-07 17:08:20 +00:00
Android Build Merger (Role)
ab0fa22e71 Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours am: f1398725a8 -s ours" into oc-mr1-dev-plus-aosp 2017-08-07 17:06:17 +00:00
Matthew Fritze
13c0095207 Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours
am: f1398725a8  -s ours

Change-Id: I6d3710f9e399901aa62d69ae9061a5f563d6dd61
2017-08-07 17:05:37 +00:00
Matthew Fritze
4023fdd48d Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
am: d1b29a4350  -s ours

Change-Id: Idcc62948fc80573fc49fef10f457841bc5bbd0de
2017-08-07 17:05:20 +00:00
Matthew Fritze
f1398725a8 Merge "Expose Location toggling logic" into oc-dr1-dev
am: 4f0e5f8395  -s ours

Change-Id: I888297c779795ad7489be0e7238d2bc5d673610e
2017-08-07 17:03:14 +00:00
Matthew Fritze
d1b29a4350 Merge "Expose Location toggling logic" into oc-dr1-dev
am: 4f0e5f8395

Change-Id: Ic0ec9ab01037fa67238b541f0e9e6bd1bde630fb
2017-08-07 17:02:19 +00:00
TreeHugger Robot
4f0e5f8395 Merge "Expose Location toggling logic" into oc-dr1-dev 2017-08-07 16:53:29 +00:00
Matthew Fritze
059295559c Expose Location toggling logic am: 6593453d59
am: 1857058348

Change-Id: Iea2cb9fe6a7f54ab93617e84e23327657b047bdc
2017-08-07 15:17:46 +00:00
Matthew Fritze
1857058348 Expose Location toggling logic
am: 6593453d59

Change-Id: Ic29118bac8ba7462e2f1dc889b4c6878e7a0e8ae
2017-08-07 15:15:41 +00:00
Beverly
2aeff818c8 Uninstall app through notif closes app settings.
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes: 62051546
Test: manual
2017-08-07 14:21:36 +00:00
Bill Yi
640a6f75b8 Import translations. DO NOT MERGE am: c89d5b0093 -s ours am: 335a436998 -s ours am: cf297dcca3 -s ours
am: 7f49c85987  -s ours

Change-Id: Ie0964faf1680df7bf0352b57aa6cf7e5fe767dfd
2017-08-07 06:30:53 +00:00
Bill Yi
7f49c85987 Import translations. DO NOT MERGE am: c89d5b0093 -s ours am: 335a436998 -s ours
am: cf297dcca3  -s ours

Change-Id: Id81f76f748bace0d87d03e2f5ff31dcc9f32750d
2017-08-07 06:22:10 +00:00
Bill Yi
cf297dcca3 Import translations. DO NOT MERGE am: c89d5b0093 -s ours
am: 335a436998  -s ours

Change-Id: I29958981b713fcee867dc6457cab116518bbe0e9
2017-08-07 06:02:28 +00:00
Bill Yi
335a436998 Import translations. DO NOT MERGE
am: c89d5b0093  -s ours

Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
2017-08-07 05:50:24 +00:00
Matthew Fritze
6593453d59 Expose Location toggling logic
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.

Test: robotests
Bug: 62022517
Change-Id: I519fad6d802efd8af2e77c623f698e19d4cdc800
2017-08-06 14:29:16 -07:00
Matthew Fritze
ef722b029c Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev am: 688e5438dd
am: a9dfbcee2b

Change-Id: I98d2aeff732b36e925591a820a63711ceddff066
2017-08-06 20:55:07 +00:00
Matthew Fritze
a9dfbcee2b Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
am: 688e5438dd

Change-Id: Ib60cae1c0cf7e0c55b90792d16df3803e84a7835
2017-08-06 20:52:37 +00:00
TreeHugger Robot
688e5438dd Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev 2017-08-06 20:46:27 +00:00
Bill Yi
c89d5b0093 Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Bill Yi
1873ef963c Import translations. DO NOT MERGE am: 57c8508960 -s ours
am: e9376927a0  -s ours

Change-Id: I0f2d6622f86448cf4ad3f67a8304a091b08be790
2017-08-06 05:02:30 +00:00
Bill Yi
e9376927a0 Import translations. DO NOT MERGE
am: 57c8508960  -s ours

Change-Id: I813ef1adb4ab7dac7fa61572aa9835f6fbc8187d
2017-08-06 04:55:27 +00:00
Bill Yi
57c8508960 Import translations. DO NOT MERGE
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 19:27:58 -07:00
Doris Ling
13fb3db4a5 Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff am: 1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp
am: ab8ee77a54  -s ours

Change-Id: Iafa6d5f904b79b4bc54aeb1a4f8f4f6809d61535
2017-08-05 05:46:38 +00:00
Doris Ling
780b81a28c Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours am: e46ed6b7c5 -s ours
am: b358605a3e  -s ours

Change-Id: I7a77106d958e23bf3c610e5a58adb0cfe40ba718
2017-08-05 05:46:12 +00:00
Android Build Merger (Role)
ab8ee77a54 Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff am: 1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp 2017-08-05 05:40:07 +00:00
Doris Ling
b358605a3e Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours
am: e46ed6b7c5  -s ours

Change-Id: Ica7b012178b2cc1d2a7115685b5054bc1e8b5d21
2017-08-05 05:39:42 +00:00
Doris Ling
fe9be5cfc7 Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff
am: 1f39ca8abf  -s ours

Change-Id: I73d69b3477582bfc5ea77a996b41e5b7c7a8d9cd
2017-08-05 05:39:41 +00:00
Doris Ling
1f39ca8abf Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am: 8f54cd46ff

Change-Id: Ib2b362ce72312738201fa2003c2c5a8795c2366d
2017-08-05 05:32:43 +00:00
Doris Ling
e46ed6b7c5 Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am: 8f54cd46ff  -s ours

Change-Id: I42d026677b6ca61de451a590b938605e79c1832c
2017-08-05 05:32:42 +00:00
TreeHugger Robot
8f54cd46ff Merge "Fix crash when dismissing suggestions." into oc-dr1-dev 2017-08-05 05:20:42 +00:00
Bill Yi
4f132c2739 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: a064cc02fc -s ours" into oc-mr1-dev-plus-aosp
am: 7984efb252  -s ours

Change-Id: I0d1e9a9a275d2c175aaf40bc0990d0b950c204fa
2017-08-05 03:19:25 +00:00
Bill Yi
987f17e658 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: cf898e3ff4 -s ours
am: de2c068f79  -s ours

Change-Id: I7894859573d3064d6ebacaee7b0425b6ca127351
2017-08-05 03:19:02 +00:00
Android Build Merger (Role)
7984efb252 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: a064cc02fc -s ours" into oc-mr1-dev-plus-aosp 2017-08-05 03:03:54 +00:00
Bill Yi
ed632b96a2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours
am: a064cc02fc  -s ours

Change-Id: Ieb0315b765927b4c668862108fea2cea6f0aed69
2017-08-05 03:03:35 +00:00
Bill Yi
de2c068f79 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours
am: cf898e3ff4  -s ours

Change-Id: If805e7deb61b8fce522bb591771ad3322bcf52a2
2017-08-05 03:03:20 +00:00
Bill Yi
a064cc02fc Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 26e4fda3f2  -s ours

Change-Id: I8bc54083c553844ec2c8a65858f4b305fa30cf82
2017-08-05 02:49:27 +00:00
Bill Yi
cf898e3ff4 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 26e4fda3f2  -s ours

Change-Id: I3a6622203e20263858b4d0e1d7fcd9233ad2c886
2017-08-05 02:49:07 +00:00
TreeHugger Robot
26e4fda3f2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-08-05 02:37:34 +00:00
Meng Wang
758a33dd51 RadioInfo: fix OMADM buttons am: d4e0fe7f93 am: 66a4bff1c8
am: 257814a658

Change-Id: I6d406b5f5c1fb72a3848760cc51bf32782db6f38
2017-08-05 00:28:43 +00:00
Meng Wang
3524827f84 RadioInfo: fix OMADM buttons am: d4e0fe7f93 am: 8c2cd0d047
am: eee2dac885

Change-Id: I7770e7ebd7ebaab728e8f0213a5df16bcc7f49c4
2017-08-05 00:28:18 +00:00
Meng Wang
257814a658 RadioInfo: fix OMADM buttons am: d4e0fe7f93
am: 66a4bff1c8

Change-Id: I3fa101023d013ce8619c6f92639df7c35d9b2ba0
2017-08-05 00:16:45 +00:00
Meng Wang
eee2dac885 RadioInfo: fix OMADM buttons am: d4e0fe7f93
am: 8c2cd0d047

Change-Id: I81b3f80fa14e8f7fe74c0cc88821c4a75f85c3b8
2017-08-05 00:15:23 +00:00
Meng Wang
66a4bff1c8 RadioInfo: fix OMADM buttons
am: d4e0fe7f93

Change-Id: I401b5c686d184124cf97edfa332dacb301454e27
2017-08-05 00:04:44 +00:00
Meng Wang
8c2cd0d047 RadioInfo: fix OMADM buttons
am: d4e0fe7f93

Change-Id: Ie7b00572102938fe64c2c6d2a6ce964c02bc493b
2017-08-05 00:04:43 +00:00
Bill Yi
8cdf71313d Import translations. DO NOT MERGE
Change-Id: I7b239876604bd4f172b8b7af2e0d9307f6b2217d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-04 17:04:36 -07:00