Commit Graph

30282 Commits

Author SHA1 Message Date
Adrian Roos
38e4e5dca6 Remove RemoteInput on lockscreen setting
Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
2016-06-16 13:29:11 -07:00
Doris Ling
b1eadb11b4 Add handling for fingerprint swipe in gesture settings.
Hide fingerprint swipe setting if it is not supported, and update the
corresponding config when user enable/disable the fingerprint gesture.

Bug: 28565958
Change-Id: I5a124d3b6933ea6d3aadceaa0eecaa4bee2ccd9d
2016-06-16 12:30:53 -07:00
Doris Ling
32d530d6cd Merge \\"Update gesture related settings in Display.\\" into nyc-mr1-dev am: 600a1eeec5
am: 6dc50f9de6

Change-Id: Id70a7c59d2d1df013d92ed93ea9307d80663c6d0
2016-06-16 19:17:44 +00:00
Maurice Lam
d189ac52a4 Use GLIF theme for Settings > Security > Screen lock
Bug: 24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
2016-06-16 12:13:11 -07:00
Doris Ling
6dc50f9de6 Merge \"Update gesture related settings in Display.\" into nyc-mr1-dev
am: 600a1eeec5

Change-Id: I817d2e43f391b4e1f097c7509bd220041b0c18d5
2016-06-16 19:07:03 +00:00
Doris Ling
600a1eeec5 Merge "Update gesture related settings in Display." into nyc-mr1-dev 2016-06-16 18:52:31 +00:00
Doris Ling
d0c8fd724d Update gesture related settings in Display.
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.

Bug: 28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
2016-06-16 10:23:49 -07:00
Bill Yi
0db0a55b3b Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 96e8845438 -s ours
am: 735a8e14c0  -s ours

Change-Id: Ic27d74d78f9bd937616d1b6b679a65b2a82b6867
2016-06-16 10:41:59 +00:00
Bill Yi
735a8e14c0 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 96e8845438  -s ours

Change-Id: I6d3a28c98d78beb2739fec3826297ee9ad524e27
2016-06-16 10:39:29 +00:00
Bill Yi
5853742b44 Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 32b427b137 -s ours am: fbd0f53df1 -s ours
am: 124ebc85e7  -s ours

Change-Id: Idfcae39351238016331bc1fe421158966340b528
2016-06-16 10:37:36 +00:00
Bill Yi
01a5b7fb17 Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 32b427b137 -s ours am: 748841c8de -s ours
am: 8668bb768b  -s ours

Change-Id: Icfef181e4307845c8ce56754d15169d1ba6b5ce3
2016-06-16 10:37:36 +00:00
TreeHugger Robot
96e8845438 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-16 10:35:08 +00:00
Bill Yi
124ebc85e7 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 32b427b137 -s ours
am: fbd0f53df1  -s ours

Change-Id: Iffc95969f3255b2aa5e9c70aec9c6f69ef00ff79
2016-06-16 10:34:19 +00:00
Bill Yi
8668bb768b Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 32b427b137 -s ours
am: 748841c8de  -s ours

Change-Id: Ib882d7c1073219233d5083219ed8e01c4927a7fe
2016-06-16 10:32:03 +00:00
Bill Yi
748841c8de Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 32b427b137  -s ours

Change-Id: I6785959fc5131f6cde32be0b960b26015fdc74c5
2016-06-16 10:28:56 +00:00
Bill Yi
fbd0f53df1 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 32b427b137  -s ours

Change-Id: I829656295916ec3bbd89ff9ca71dad569beca264
2016-06-16 10:28:56 +00:00
TreeHugger Robot
32b427b137 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-16 10:25:12 +00:00
TreeHugger Robot
2bafcc8418 Merge "Import translations. DO NOT MERGE" 2016-06-16 09:54:11 +00:00
Bill Yi
13cee79077 Import translations. DO NOT MERGE
Change-Id: Ib6520ea1418dac76ad17a77c0ddd393cc7a41938
Auto-generated-cl: translation import
2016-06-16 02:03:59 -07:00
Bill Yi
95fda91511 Import translations. DO NOT MERGE
Change-Id: I9909b1c75f95258630ca3b014768b5a7afcd8411
Auto-generated-cl: translation import
2016-06-16 01:52:41 -07:00
Bill Yi
265420891b Import translations. DO NOT MERGE
Change-Id: Iaff232bca38f600a0a252c4db1e3ca6e39d0ae5d
Auto-generated-cl: translation import
2016-06-16 01:08:33 -07:00
Yohei Yukawa
966476b7dc Teach hard keyboard settings about correct user ID
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD is a per-user settings.
PhysicalKeyboardFragment needs to use the current user's ID rather than
hard-coded user ID 0.

Bug: 29406181
Change-Id: Ie40f729f3c85e9ce9ad8f957caba338786b119d9
2016-06-16 00:02:01 -07:00
Roozbeh Pournader
be66270068 Merge \"BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b am: 20d6b425c5\" into nyc-mr1-dev-plus-aosp
am: 7f431178cf

Change-Id: I990a3251caf08afc5d4eedec6a8bf89808f4904c
2016-06-16 02:17:39 +00:00
Roozbeh Pournader
bb162e7970 BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b am: 7d9cdfd4b6
am: 4d70d4ffa1

Change-Id: I061e735b76071d63c61918b06dffe898719a106d
2016-06-16 02:17:38 +00:00
Android Build Merger (Role)
7f431178cf Merge "BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b am: 20d6b425c5" into nyc-mr1-dev-plus-aosp 2016-06-16 02:02:06 +00:00
Roozbeh Pournader
4d70d4ffa1 BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b
am: 7d9cdfd4b6

Change-Id: I9833706a1048ae3ecd703ae221c510ed9700b503
2016-06-16 02:01:55 +00:00
Roozbeh Pournader
35d762f482 BidiFormat adapter name for bluetooth_is_visible_message am: 77893a4c4b
am: 20d6b425c5

Change-Id: I828c921cc0a128dd2c7f612d3dad098ba747d5a0
2016-06-16 02:01:53 +00:00
Roozbeh Pournader
7d9cdfd4b6 BidiFormat adapter name for bluetooth_is_visible_message
am: 77893a4c4b

Change-Id: I2df1050e9b9cb20e369fca56e3e457a3cf2a0397
2016-06-16 01:59:37 +00:00
Roozbeh Pournader
20d6b425c5 BidiFormat adapter name for bluetooth_is_visible_message
am: 77893a4c4b

Change-Id: I015d588d17dbd767d528d986d0a784c361889edc
2016-06-16 01:59:22 +00:00
Daniel Nishi
79b0925231 Merge \\"Show storage manager settings using a system property.\\" into nyc-mr1-dev am: 3d040e55d9
am: 4765fd9a4b

Change-Id: Id9137b84563bcd580c43a986fdb05f00f38150e5
2016-06-15 23:22:35 +00:00
Daniel Nishi
4765fd9a4b Merge \"Show storage manager settings using a system property.\" into nyc-mr1-dev
am: 3d040e55d9

Change-Id: I2adbcb4260adc1719549ac4e26700a6dc099481e
2016-06-15 22:19:34 +00:00
Daniel Nishi
3d040e55d9 Merge "Show storage manager settings using a system property." into nyc-mr1-dev 2016-06-15 22:14:09 +00:00
Roozbeh Pournader
77893a4c4b BidiFormat adapter name for bluetooth_is_visible_message
Previously, adapter names which tend to be LTR and may appear at the
beginning of the string could cause the detected bidi direction of the whole
string (which would be RTL in RTL locales) to get miscalculated as LTR.

With this fix, not only the detected bidi direction would be correct,
but also odd adapter names would not impact the bidi layout of the
whole string.

Bug: 28816891
Change-Id: I1d25edbeeff7e9c013bb6c741e7f706431e721dc
2016-06-15 14:46:11 -07:00
Chris Wren
d55cebe713 Merge \"Merge \\\"log as counters instead of histograms\\\" into nyc-dev am: 6913b6118f am: 420d46ee68\" into nyc-mr1-dev-plus-aosp
am: 51a68b2c2d

Change-Id: I1a2d25ca0aaf32871001f81b266e23da7a6f63b2
2016-06-15 19:12:43 +00:00
Chris Wren
1f19c4cddf Merge \\\"log as counters instead of histograms\\\" into nyc-dev am: 6913b6118f am: 0a13cfbf8e
am: a0e9f47a69

Change-Id: I240cf8faefd48766a64893756c20c4ebfed83de6
2016-06-15 19:12:43 +00:00
Maurice Lam
e4f9b74924 resolve merge conflicts of c8466a3 to master
Change-Id: I2fce0f0eaa70bb5196faee0143dfbfbcc93659fa
2016-06-15 11:26:32 -07:00
Android Build Merger (Role)
51a68b2c2d Merge "Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f am: 420d46ee68" into nyc-mr1-dev-plus-aosp 2016-06-15 18:22:33 +00:00
Chris Wren
6e2c970988 Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f
am: 420d46ee68

Change-Id: Ie3463a5f54e7105ccfe157009d3216e5799412bd
2016-06-15 18:22:25 +00:00
Chris Wren
a0e9f47a69 Merge \\"log as counters instead of histograms\\" into nyc-dev am: 6913b6118f
am: 0a13cfbf8e

Change-Id: Idd702a08ce45c528cf91b0b79ce8249432dc3cca
2016-06-15 18:22:17 +00:00
Chris Wren
0a13cfbf8e Merge \"log as counters instead of histograms\" into nyc-dev
am: 6913b6118f

Change-Id: Ic3178f2514097df73527f446a5daf11fc6c25acc
2016-06-15 18:17:52 +00:00
Chris Wren
420d46ee68 Merge \"log as counters instead of histograms\" into nyc-dev
am: 6913b6118f

Change-Id: I1f63c363b2980682dd61e863d94b71aeca3048b5
2016-06-15 18:17:52 +00:00
Maurice Lam
45eb105f93 Merge \\"Fingerprint string updates\\" into nyc-mr1-dev am: e33872772c
am: b2f98a37c0

Change-Id: Iac3e46a38cee0463eeaa4d2515d634236b4afef8
2016-06-15 18:16:05 +00:00
TreeHugger Robot
6913b6118f Merge "log as counters instead of histograms" into nyc-dev 2016-06-15 18:13:53 +00:00
Daniel Nishi
0074855229 Show storage manager settings using a system property.
This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.

Bug: 29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3
2016-06-15 11:01:58 -07:00
Maurice Lam
c8466a339a Merge \"Update UI style for GLIF buttons\" into nyc-mr1-dev
am: a028010c23

Change-Id: Ic19e5d4909fbd7c2d7841e12cfec29b264d144a6
2016-06-15 17:59:24 +00:00
Maurice Lam
b2f98a37c0 Merge \"Fingerprint string updates\" into nyc-mr1-dev
am: e33872772c

Change-Id: I9e330926b8160d434605233d5b8c50a0026ebad3
2016-06-15 17:59:20 +00:00
Sudheer Shanka
d98cba58c8 Merge "Make guest field unselectable only if it is not disabled by admin." 2016-06-15 17:58:10 +00:00
Jason Monk
13cbde654f Merge \\\"Fix SimStatus updatePhoneInfos\\\" into nyc-dev am: b53117f55c am: 2f4c80f3c7
am: deec78d0ca

Change-Id: I4c60627442d8bbf1d51bc1ddc14848d1085e9f1d
2016-06-15 17:32:33 +00:00
Jason Monk
16da0e3c98 Merge \\\"Fix SimStatus updatePhoneInfos\\\" into nyc-dev am: b53117f55c am: e3eaa08742
am: 4edb76127c

Change-Id: I8d61851d4f4e27ef661630ec9cab788f85003383
2016-06-15 17:32:32 +00:00
Maurice Lam
a028010c23 Merge "Update UI style for GLIF buttons" into nyc-mr1-dev 2016-06-15 17:07:54 +00:00