Commit Graph

68773 Commits

Author SHA1 Message Date
Jason Hsu
08a5acc608 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: bea0e029a4 am: 6a9fe5c9a5
Change-Id: I3413026c57fa1ed139463119b203c105455fc471
2020-05-12 18:53:06 +00:00
Jason Hsu
6a9fe5c9a5 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: bea0e029a4
Change-Id: I69b295453c5c1777286fd7fba0ae19f85dafdf1b
2020-05-12 18:41:01 +00:00
Jason Hsu
bea0e029a4 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729
Change-Id: Ie3757bf068ea020339518dcb8fa60b003e34db09
2020-05-12 18:24:51 +00:00
Jason Hsu
394f925729 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev 2020-05-12 18:04:49 +00:00
Jay Aliomer
a6a005e89b Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 39065aece9 am: 4760edc65c am: 1a2353fcf4
Change-Id: I56a21077964c3c472f37b7e6707562cd3b36d44d
2020-05-12 16:35:47 +00:00
Jay Aliomer
1a2353fcf4 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 39065aece9 am: 4760edc65c
Change-Id: Ice0b7bc2cc4e5e39ed4a8315b3a17f55ecb2a068
2020-05-12 16:21:55 +00:00
Kholoud Mohamed
65c5f7e285 Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: d3bd08653d am: d8688acfd9 am: 391db760a0
Change-Id: I41da9424f9ccc037b0be4e176358ec0d0e6a87af
2020-05-12 16:15:11 +00:00
Jay Aliomer
4760edc65c Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 39065aece9
Change-Id: I087637946cb50c4dbf5ec37fb20a4129691ffe37
2020-05-12 16:10:01 +00:00
Kholoud Mohamed
391db760a0 Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: d3bd08653d am: d8688acfd9
Change-Id: Ic9037d516972e6015d4f17d442834c896ef2ca16
2020-05-12 16:03:41 +00:00
Jay Aliomer
39065aece9 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1
Change-Id: I84b08fc46ba0e41ce076e49b46f38a7d64121584
2020-05-12 15:58:06 +00:00
Kholoud Mohamed
d8688acfd9 Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: d3bd08653d
Change-Id: I81a3622d9e8ce812f958eff544f833b0097fecac
2020-05-12 15:43:16 +00:00
Jay Aliomer
a5e7d180f1 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev 2020-05-12 15:42:49 +00:00
jasonwshsu
112cd4d6d1 Fix the issue that title of Color inversion page is wrong
* Title need to be set from getPreferenceScreenResId(), recover the xml file.

Bug: 156201719
Test: manual test
Change-Id: Ib8b79c320c6a48b1dd679738ddc7022ccaeaed86
2020-05-12 23:35:11 +08:00
Kholoud Mohamed
d3bd08653d Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea
Change-Id: Ic44752f686a0878ab05e8ccf7a2e4190fa153b26
2020-05-12 15:29:49 +00:00
Kholoud Mohamed
311ff0c1ea Merge "String changes in the cross profile settings page" into rvc-dev 2020-05-12 15:13:32 +00:00
TreeHugger Robot
1431a53b1d Merge "Fix broken test cases" into rvc-dev am: defd64c797 am: a895da9249 am: 5cd6167eef am: 4941e55d3c
Change-Id: Id15e83d82bceca55936d57a644d36cc2c9a0dc47
2020-05-12 13:31:01 +00:00
TreeHugger Robot
4941e55d3c Merge "Fix broken test cases" into rvc-dev am: defd64c797 am: a895da9249 am: 5cd6167eef
Change-Id: Iab7d1e72f0440c75f4f176152611ac26f44f8652
2020-05-12 13:19:23 +00:00
TreeHugger Robot
5cd6167eef Merge "Fix broken test cases" into rvc-dev am: defd64c797 am: a895da9249
Change-Id: I35b4890b46b04bd719492202a8d7829eb0940a65
2020-05-12 13:00:20 +00:00
TreeHugger Robot
a895da9249 Merge "Fix broken test cases" into rvc-dev am: defd64c797
Change-Id: I5e9207d6fc8041e4d4ff5b4da98fab1a52e7e4e9
2020-05-12 12:42:31 +00:00
PETER LIANG
5cca393b3b Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b am: 99f1a37582 am: a0953560f8 am: 7fcf167362
Change-Id: I7df7b79bc75d61130bf45bdf3763c10d8933115f
2020-05-12 12:34:47 +00:00
TreeHugger Robot
defd64c797 Merge "Fix broken test cases" into rvc-dev 2020-05-12 12:28:04 +00:00
PETER LIANG
7fcf167362 Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b am: 99f1a37582 am: a0953560f8
Change-Id: I6a681d06c3361efa89e435cb31635d27f808fb96
2020-05-12 12:13:55 +00:00
PETER LIANG
a0953560f8 Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b am: 99f1a37582
Change-Id: I87fbd8dbf03219c5e56ff2ac9a1e0afb566b4e82
2020-05-12 11:56:08 +00:00
PETER LIANG
99f1a37582 Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b
Change-Id: Ib3e57d67fd4870356ef672ee0d60489842b3e673
2020-05-12 11:42:56 +00:00
PETER LIANG
a85f5dc80b Merge "Add the settings content observer for shortcut preference." into rvc-dev 2020-05-12 11:29:11 +00:00
Jason Chiu
b2ea4ce87c Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106 am: 16c6b13ab4 am: 00ab4b4861 am: fb7881aaa9
Change-Id: Ifabf88bdb79bc58bac5dfd3fde27ce22260cac58
2020-05-12 10:36:08 +00:00
Jason Chiu
fb7881aaa9 Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106 am: 16c6b13ab4 am: 00ab4b4861
Change-Id: Ia517de98e561d3d659d9c9d37b3ba8ae1db54892
2020-05-12 10:19:11 +00:00
Jason Chiu
00ab4b4861 Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106 am: 16c6b13ab4
Change-Id: I325eac15491c2103b4f32a82b50b9760a352549b
2020-05-12 10:03:45 +00:00
TreeHugger Robot
6f2741862c Merge "Revise the text limit of volume shortcut key." into rvc-dev am: defa38c7ae am: e77ce59744 am: 3c5aa80a14 am: f478213d6e
Change-Id: Ibac73f2775e58828efea43c40ac0ccbab3aecc83
2020-05-12 09:51:04 +00:00
Jason Chiu
16c6b13ab4 Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106
Change-Id: Ic4666fdfdae35f2c7b516504eb07be7f31bef70d
2020-05-12 09:43:36 +00:00
TreeHugger Robot
f478213d6e Merge "Revise the text limit of volume shortcut key." into rvc-dev am: defa38c7ae am: e77ce59744 am: 3c5aa80a14
Change-Id: I8ca0a8602743fd6e4031d436e65c1555ee559cf0
2020-05-12 09:37:45 +00:00
Jason Chiu
b0230a6106 Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev 2020-05-12 09:33:54 +00:00
TreeHugger Robot
3c5aa80a14 Merge "Revise the text limit of volume shortcut key." into rvc-dev am: defa38c7ae am: e77ce59744
Change-Id: I90dd6280f45a4ae9ba8061ff8b085e705842327d
2020-05-12 09:20:41 +00:00
TreeHugger Robot
e77ce59744 Merge "Revise the text limit of volume shortcut key." into rvc-dev am: defa38c7ae
Change-Id: I3a7b93c26d49bb49758ced5cccb270afc05bb3f9
2020-05-12 09:05:23 +00:00
Tsung-Mao Fang
d6c88649f6 Fix broken test cases
Test: Run robo test
Fix: 127602715
Change-Id: Idec3351b76801de98fac502ea59b2396a60df937
2020-05-12 16:57:05 +08:00
TreeHugger Robot
defa38c7ae Merge "Revise the text limit of volume shortcut key." into rvc-dev 2020-05-12 08:49:40 +00:00
Peter_Liang
beb7d8485d Revise the text limit of volume shortcut key.
Revise the char limits as 100.

Bug: 156268057
Test: manual test
Change-Id: I76b9dd5adf5201d6640c7023c487a8205a56bc9a
2020-05-12 14:20:49 +08:00
Peter_Liang
785af0c15a Add the settings content observer for shortcut preference.
Root cause:
Didn't update the UI when settings value chagned.

Next:
Add the settings content observer.

Bug: 155837154
Test: manual test
Change-Id: Icee0bb50f88987ea6c8a0be59bd936628a32ca1e
2020-05-12 14:15:54 +08:00
Betty Chang
4f8129034f Merge "Add setPackage for PendingIntent in SliceHelper" 2020-05-12 04:13:15 +00:00
TreeHugger Robot
9709bf12cf Merge "[Wi-Fi] Fix QR code generator summary string" 2020-05-12 01:02:50 +00:00
Nate Myren
a32b8c77b4 Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f am: fbe64a68da am: 6544d27f38 am: 93e1d353a9
Change-Id: I80f823429a29b3eeb46412581987ac8519385fca
2020-05-11 23:48:43 +00:00
Nate Myren
93e1d353a9 Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f am: fbe64a68da am: 6544d27f38
Change-Id: I9126e32a7d39a859c1b500e552e8279dbb661b62
2020-05-11 23:33:57 +00:00
Nate Myren
6544d27f38 Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f am: fbe64a68da
Change-Id: I4d808c3ca220f0cdc764e1f26a6b84df94e7c07f
2020-05-11 23:15:57 +00:00
Nate Myren
fbe64a68da Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f
Change-Id: I547a008b73764af371f27710c1f94348fb3d0644
2020-05-11 22:55:34 +00:00
Nate Myren
0c6037af5f Merge "Add Auto Revoke log to the App Info page" into rvc-dev 2020-05-11 22:37:04 +00:00
TreeHugger Robot
576f6c9c75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed -s ours am: 2aba367d93 -s ours am: 9fef083817 -s ours
am skip reason: subject contains skip directive

Change-Id: I8796e4da0d92ec439087a1f37f52455efc00a4e1
2020-05-11 20:14:51 +00:00
TreeHugger Robot
e729b2143f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d9ebaabd68 -s ours am: 0356deba45 -s ours am: ced58c796a -s ours
am skip reason: subject contains skip directive

Change-Id: I0068c1caea4fb67f01424e00e158cc29d1fd18a0
2020-05-11 20:14:37 +00:00
TreeHugger Robot
d3ea4c9bdc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 57150e5930 -s ours am: 7d8a49df56 -s ours am: 619fa7a394 -s ours am: def9a297cc -s ours
am skip reason: subject contains skip directive

Change-Id: Ic6b758692188fc9ce96dc8cbfa2065d979cc0549
2020-05-11 20:14:15 +00:00
TreeHugger Robot
f54237fa10 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca5d1ee340 -s ours am: cff01cd493 -s ours am: b866d5b243 -s ours am: b8cdb350e3 -s ours
am skip reason: subject contains skip directive

Change-Id: Idef9f808ed58a79596b098ca861e225fa979251d
2020-05-11 20:13:37 +00:00
TreeHugger Robot
944a2665a5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed -s ours am: 4470cc0dbe -s ours am: 42afd7375d -s ours
am skip reason: subject contains skip directive

Change-Id: I368c6c36bee8f819b41a6eb03f0c53c8e57dfd8e
2020-05-11 20:12:36 +00:00