Andreas Gampe
ada98fb5b3
resolve merge conflicts of d30af7c
to master
...
Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1
2016-08-30 20:36:50 -07:00
Todd Kennedy
d30af7c247
Implement Web Action settings am: d5824967ee
...
am: 1fc2e5dcb7
Change-Id: I4e4976e848af3e8d12b65730147be1257fed382c
2016-08-31 02:28:38 +00:00
Todd Kennedy
1fc2e5dcb7
Implement Web Action settings
...
am: d5824967ee
Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5
2016-08-31 02:25:37 +00:00
Salvador Martinez
f0213599e4
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev am: adfcb15518
am: 6584b76a87
...
am: 2453fdc976
Change-Id: Ibb34c718becca596d3c404d96dcf27385d08bd97
2016-08-31 01:20:13 +00:00
Salvador Martinez
0308649104
Can restore state on rotate personal dict screen am: 8f4eb4d74b
am: 45cdbd2669
...
am: 6b41874231
Change-Id: I426e4bfea077b3494a8a5a8e3eea0659186b60f8
2016-08-31 01:19:32 +00:00
Andrew Sapperstein
c93974a5b2
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am: a200918af0
am: 65a8409ddc
am: f6908339fd
...
am: b69b72c2ed
Change-Id: Ib42a7684e26fe75b21978cdbefe0f1072d9ab758
2016-08-31 01:19:31 +00:00
Andrew Sapperstein
e6c06f826f
Use LinkTextView for support disclaimer text. am: 7e9146950d
am: d63e187b1a
am: c3733b8653
...
am: 25d10fd293
Change-Id: Ie1ac8f05cbe91dd99ea3840c02932ba98050eb91
2016-08-31 01:19:30 +00:00
Felipe Leme
3b04469fe4
Merge "Only display System section for current user." into nyc-mr1-dev am: c24a46128a
am: 9eb3b31c29
...
am: b934885f0c
Change-Id: I2905157ca66a71e6119f47ac3fc536e8b29e3fd9
2016-08-31 01:19:29 +00:00
Felipe Leme
b152113898
Only display System section for current user. am: ce37ef51aa
am: 0547440ad7
...
am: 3d9cb084e9
Change-Id: I5b210e644b2fcdeaa7611a373ab2dbed5db89cd2
2016-08-31 01:19:28 +00:00
Salvador Martinez
2453fdc976
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev am: adfcb15518
...
am: 6584b76a87
Change-Id: I48ae580a4c8d96aa479bb526a3555f062cbfe4a3
2016-08-31 00:45:30 +00:00
Salvador Martinez
6b41874231
Can restore state on rotate personal dict screen am: 8f4eb4d74b
...
am: 45cdbd2669
Change-Id: I03d263ec9747dab3a658362e6e58370d28c92101
2016-08-31 00:45:29 +00:00
Salvador Martinez
6584b76a87
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
...
am: adfcb15518
Change-Id: I968eb6945d2c276f6b7590125b50c7d48671798c
2016-08-31 00:43:06 +00:00
Salvador Martinez
45cdbd2669
Can restore state on rotate personal dict screen
...
am: 8f4eb4d74b
Change-Id: I8e4a2a29474784e60eb41b356cac65fe5b86886c
2016-08-31 00:43:06 +00:00
Andrew Sapperstein
b69b72c2ed
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am: a200918af0
am: 65a8409ddc
...
am: f6908339fd
Change-Id: I8c6f041be0787cb7f6b2f268a00c82b6683950ae
2016-08-31 00:39:59 +00:00
Andrew Sapperstein
25d10fd293
Use LinkTextView for support disclaimer text. am: 7e9146950d
am: d63e187b1a
...
am: c3733b8653
Change-Id: I0ecdd164e846e6af7085ff83e8c177f085b9e958
2016-08-31 00:39:59 +00:00
Salvador Martinez
adfcb15518
Merge "Can restore state on rotate personal dict screen" into nyc-mr1-dev
2016-08-31 00:38:15 +00:00
Andrew Sapperstein
f6908339fd
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev am: a200918af0
...
am: 65a8409ddc
Change-Id: I11631880866d49e4a69869b375779aab2c472f68
2016-08-31 00:34:45 +00:00
Andrew Sapperstein
c3733b8653
Use LinkTextView for support disclaimer text. am: 7e9146950d
...
am: d63e187b1a
Change-Id: Iffd7cc56eb9ee612b8c86a668f4851f229b746ac
2016-08-31 00:34:45 +00:00
Andrew Sapperstein
65a8409ddc
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
...
am: a200918af0
Change-Id: I7554d650756aad063d8cf091022fb2a04f823b81
2016-08-31 00:28:27 +00:00
Andrew Sapperstein
d63e187b1a
Use LinkTextView for support disclaimer text.
...
am: 7e9146950d
Change-Id: Ia4a998039bfcdea3419a512d342665248f0b7ac3
2016-08-31 00:28:27 +00:00
Andrew Sapperstein
a200918af0
Merge "Use LinkTextView for support disclaimer text." into nyc-dr1-dev
2016-08-31 00:21:29 +00:00
Felipe Leme
b934885f0c
Merge "Only display System section for current user." into nyc-mr1-dev am: c24a46128a
...
am: 9eb3b31c29
Change-Id: I295cabb60d2aa78e7b2cf11b02898e115c88a7fa
2016-08-30 22:33:50 +00:00
Felipe Leme
3d9cb084e9
Only display System section for current user. am: ce37ef51aa
...
am: 0547440ad7
Change-Id: Ibff762a11759d8b15e5df7208636af5305ac6999
2016-08-30 22:33:49 +00:00
Felipe Leme
9eb3b31c29
Merge "Only display System section for current user." into nyc-mr1-dev
...
am: c24a46128a
Change-Id: I6fe2bf073e3511c94a1c8f64cea28fa512aaa195
2016-08-30 22:31:20 +00:00
Felipe Leme
0547440ad7
Only display System section for current user.
...
am: ce37ef51aa
Change-Id: I6f0aa56dc8ec2c10687bea442c53db1f53242f7b
2016-08-30 22:31:20 +00:00
TreeHugger Robot
c24a46128a
Merge "Only display System section for current user." into nyc-mr1-dev
2016-08-30 22:24:16 +00:00
Doris Ling
5d4dc3748d
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720
am: ba7e57ec06
am: dc8a2d2b36
am: 3bac184939
...
am: aa40e5b710
Change-Id: I0501fd728da7e5d9b30a805b911de007fbd8324f
2016-08-30 21:37:14 +00:00
Doris Ling
01b36f8e24
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720
am: b7d9f7b83d
...
am: 925584fb84
Change-Id: I381bd31931d05e22f053ea9fdb822be3c91575f0
2016-08-30 21:37:13 +00:00
Doris Ling
aa40e5b710
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720
am: ba7e57ec06
am: dc8a2d2b36
...
am: 3bac184939
Change-Id: Ic5f3d6a57753454ce5aeb64b767220ad84c4ef08
2016-08-30 20:25:10 +00:00
Doris Ling
3bac184939
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720
am: ba7e57ec06
...
am: dc8a2d2b36
Change-Id: I276e37f4a49de53e996db168b022c45f18f33cea
2016-08-30 20:16:11 +00:00
Doris Ling
dc8a2d2b36
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720
...
am: ba7e57ec06
Change-Id: Ic2e0b0c977cf11dcca4ed87deeb8bc6fe9a27420
2016-08-30 20:07:38 +00:00
Doris Ling
ba7e57ec06
Remove preference "Searching for Wi-Fi networks..."
...
am: b8e8485720
Change-Id: Ie264fbdddf2aff8b8f5f4d6aac2fc079b98c9747
2016-08-30 20:05:09 +00:00
Doris Ling
925584fb84
Remove preference "Searching for Wi-Fi networks..." am: b8e8485720
...
am: b7d9f7b83d
Change-Id: I3d21413f7ee61001bae570b478871af6f95d2999
2016-08-30 20:05:08 +00:00
Doris Ling
b7d9f7b83d
Remove preference "Searching for Wi-Fi networks..."
...
am: b8e8485720
Change-Id: I170a0f79c0d7c89de314c81088ac8b5939ddff11
2016-08-30 20:01:40 +00:00
Andrew Sapperstein
7e9146950d
Use LinkTextView for support disclaimer text.
...
LinkTextView uses LinkAccessibilityHelper to properly handle
making links accessible.
Deleted Settings' outdated fork for the version in setupwizardlib.
Test: manual
Change-Id: I38c031f96b5be0d45e4cc1aa358f95b229f17480
Fixes: 31077012
2016-08-30 19:57:39 +00:00
Felipe Leme
ce37ef51aa
Only display System section for current user.
...
Otherwise it will be displayed twice on work profiles.
Change-Id: Ic7d21a57f72b9f4a254d574adce90afd7cd27b90
Test: manual verification
Fixes: 31108318
2016-08-30 12:00:27 -07:00
Salvador Martinez
8f4eb4d74b
Can restore state on rotate personal dict screen
...
When adding/editing a word for your personal dictionary
rotating the screen could cause the language to change
back to the device default. This has been fixed.
Test: ag/1389633, robolectric not supported in this branch.
Bug: 30874931
Change-Id: I0c8ebec5f4d5e7b23112b656c482c3b2cda7791f
2016-08-30 18:34:15 +00:00
Doris Ling
b8e8485720
Remove preference "Searching for Wi-Fi networks..."
...
When we add the preference "Searching for Wi-Fi networks...", we didn't
provide a key to the preference. As a result, each time when we get
access point update and try to show such tile, it creates a new one, and
results in multiple entries of such tile. Adding a key to the preference
will prevent the multiple entry from being added.
Test: Manual -
1. Turn wifi off and on several times, verify that there is only one entry
of "Searching for Wi-Fi networks..." when initializing the wifi access
point list.
2. Verifies that when the access point list is established, the
"Searching for Wi-Fi networks..." entry is gone.
Change-Id: Iaad329d89f8e4b52129d0661501aa34fbd956692
Change-Id: I1bfa77051e068926e8c876a89adf14d143970e7e
Fixes: 31143961
2016-08-30 17:41:44 +00:00
Christopher Wiley
aea52927d9
Merge commit '87e59d0' into nyc-dev-plus-aosp am: 94473046fb
...
am: 66603903b3
Change-Id: I0ec61e086cf9a59cc271d53d8cf6b95c820db389
2016-08-30 04:49:59 +00:00
Maurice Lam
ee851c2ad4
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev am: 23a91fb029
am: cc04f36357
...
am: f2d6a6da85
Change-Id: Ibc436f2f8180269efce803a9915be1f8aa4bfd6f
2016-08-30 04:49:58 +00:00
Maurice Lam
99ca071185
Add label to redaction interstitial activity am: 05c38450e2
am: bf4f7fdace
...
am: a7cb89e177
Change-Id: I7d3e2b31070b9b13d81e57f4be554c771a0f87b8
2016-08-30 04:49:57 +00:00
Philip P. Moltmann
02f393d990
Merge "Hide unused recylerview to not confuse talkback." into nyc-mr1-dev am: 5dbc933501
am: 5626726151
...
am: 9820925bcf
Change-Id: Iac9500ef8215fa922065967307727e0bf4256046
2016-08-30 04:49:56 +00:00
Philip P. Moltmann
578bc45793
Hide unused recylerview to not confuse talkback. am: 6a6db008a9
am: 2664c2331f
...
am: 5bc6a57729
Change-Id: I934af4a441b19f28a30ea06b74da8df0f270072e
2016-08-30 04:49:55 +00:00
Christopher Wiley
66603903b3
Merge commit '87e59d0' into nyc-dev-plus-aosp
...
am: 94473046fb
Change-Id: Ia6739501f00fccd8a2363ff19d49a50d17595cba
2016-08-30 01:12:05 +00:00
The Android Automerger
94473046fb
Merge commit '87e59d0' into nyc-dev-plus-aosp
2016-08-30 01:00:30 +00:00
Maurice Lam
f2d6a6da85
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev am: 23a91fb029
...
am: cc04f36357
Change-Id: I9be5c629d73c8507d30222e4f0e447014e62193f
2016-08-30 00:00:15 +00:00
Maurice Lam
a7cb89e177
Add label to redaction interstitial activity am: 05c38450e2
...
am: bf4f7fdace
Change-Id: I7152656c228ee4cb306174fcbfd0f7328675038d
2016-08-30 00:00:15 +00:00
Maurice Lam
cc04f36357
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev
...
am: 23a91fb029
Change-Id: Ic52ee043145f897d10f074daefdb6347694f5c67
2016-08-29 23:52:00 +00:00
Maurice Lam
bf4f7fdace
Add label to redaction interstitial activity
...
am: 05c38450e2
Change-Id: I34ba0a2686785bc0d3477eed06a85d66573fd87e
2016-08-29 23:52:00 +00:00
Maurice Lam
23a91fb029
Merge "Add label to redaction interstitial activity" into nyc-mr1-dev
2016-08-29 23:36:35 +00:00