John Reck
773bbe0357
Revert "Add ninePatch support to Canvas.h"
...
This reverts commit edca320a2b42011f98c308fdf25fc0494c6a5454.
Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b
2015-08-17 15:24:09 -07:00
Seigo Nonaka
c8e6c7996f
Merge "Remove duplicate separator definition."
2015-08-17 21:33:30 +00:00
Elliott Hughes
7934a41bfb
am 84d4917c: am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
...
* commit '84d4917c7560da364eb8fe79353e046807beb416':
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
2015-08-17 21:27:41 +00:00
Elliott Hughes
84d4917c75
am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
...
* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e':
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
2015-08-17 21:15:40 +00:00
Joe Fernandez
da9d1dc97a
am cd3f8753: am c75d4050: am 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
...
* commit 'cd3f875321a30f9cc21e631fa85f7fb12901b147':
docs: Support Library v23 updates
2015-08-17 21:02:38 +00:00
Elliott Hughes
12cf0f9c4c
am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
...
* commit 'eba23aaa765822c5ed8a152af00da1998d61409e':
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
2015-08-17 21:01:59 +00:00
John Reck
a93f5794f2
Merge "Makefile re-jiggering"
2015-08-17 20:55:27 +00:00
Joe Fernandez
cd3f875321
am c75d4050: am 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
...
* commit 'c75d40500d4d25f4535f6b54390e3aa4a0ee8758':
docs: Support Library v23 updates
2015-08-17 20:51:18 +00:00
Elliott Hughes
eba23aaa76
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
2015-08-17 20:51:00 +00:00
Alan Viverette
46fb1249bc
Merge "Separate TabWidget selection from keyboard focus"
2015-08-17 20:44:17 +00:00
Joe Fernandez
c75d40500d
am 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
...
* commit '811330ed182ab4827b2ad4c8a4944af0a4a8b18a':
docs: Support Library v23 updates
2015-08-17 20:44:15 +00:00
Joe Fernandez
811330ed18
am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
...
* commit '1eb1f7cf9be8e7491d6e676c12ce1fccd31ee479':
docs: Support Library v23 updates
2015-08-17 20:36:53 +00:00
John Reck
d2e7214179
Makefile re-jiggering
...
Change-Id: I6a8d7c9ecbc4f1af8bc4a6e1409787f215d6fc5b
2015-08-17 13:29:10 -07:00
Alan Viverette
153d1b346c
Merge "Re-enable TAB traversal in ListView"
2015-08-17 20:28:40 +00:00
Joe Fernandez
1eb1f7cf9b
am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
...
* commit '46ae218b2aeab9e92d59b3d074cc43d696be11d5':
docs: Support Library v23 updates
2015-08-17 20:27:41 +00:00
Dirk Dougherty
8e9fdc124a
am a6eca103: am a38d97ca: am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'a6eca103b1d7c101343284d6f33fbf816cdeff92':
Doc change: misc fixes for preview 3.
2015-08-17 20:25:57 +00:00
Joe Fernandez
46ae218b2a
Merge "docs: Support Library v23 updates" into mnc-dev
2015-08-17 20:22:15 +00:00
Rich Slogar
f0a340e0fe
docs: Support Library v23 updates
...
Change-Id: I0f5b6109d907e9bb29bd500eb852a031f8952287
2015-08-17 13:21:00 -07:00
Dirk Dougherty
a6eca103b1
am a38d97ca: am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'a38d97ca8aac6c830fbbfd890560d8a971eebea1':
Doc change: misc fixes for preview 3.
2015-08-17 20:18:49 +00:00
Bryce Lee
9600b7fb40
am de243eb2: am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
...
* commit 'de243eb290c194b2204a27c0276bae5cd024797d':
Introduce permission for updating the cell broadcast content provider.
2015-08-17 20:16:27 +00:00
Dirk Dougherty
a38d97ca8a
am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit '76342acf89cf19b42a3671ea48b2f0264c0ce484':
Doc change: misc fixes for preview 3.
2015-08-17 20:11:02 +00:00
Bryce Lee
de243eb290
am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
...
* commit '55d39ecb55052641db98566b5323c0af2b476990':
Introduce permission for updating the cell broadcast content provider.
2015-08-17 20:08:19 +00:00
Dirk Dougherty
76342acf89
am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'ed257d1a3c7d94980e6fc1524a8e85f4e1d3959a':
Doc change: misc fixes for preview 3.
2015-08-17 20:03:59 +00:00
Bryce Lee
55d39ecb55
am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
...
* commit 'd74a66bd97ed52fc985e9fa145072a9fc4e0a3e3':
Introduce permission for updating the cell broadcast content provider.
2015-08-17 20:01:51 +00:00
Dirk Dougherty
ed257d1a3c
am bd58d6fc: Doc change: misc fixes for preview 3.
...
* commit 'bd58d6fcadad111cee35778a4f77c4f789a0f8c6':
Doc change: misc fixes for preview 3.
2015-08-17 19:56:28 +00:00
Bryce Lee
d74a66bd97
Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev
2015-08-17 19:54:19 +00:00
Elliott Hughes
e17788ceff
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
...
Change-Id: Ideef62acbf53a442167c9b8038021affffef9e8a
2015-08-17 12:41:46 -07:00
Junda Liu
448e082850
am e7194f99: am 9ddc014d: am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit 'e7194f9954866fafcaeb2089bee62f0e550d02d7':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:36:55 +00:00
Dirk Dougherty
bd58d6fcad
Doc change: misc fixes for preview 3.
...
Change-Id: Ib389f3db0e38f13d2634fda9e893c1dd87dcd6fc
2015-08-17 12:27:34 -07:00
Junda Liu
e7194f9954
am 9ddc014d: am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit '9ddc014da24a74ea7ac6b2816521cb60e9059306':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:26:55 +00:00
Chris Tate
cb114835f8
am df1fffe2: am 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit 'df1fffe20d8955d388110ae4ed57681e85d233b7':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:26:55 +00:00
Quddus Chong
dc8c0be50a
am d87a21b5: am 433ecac9: am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit 'd87a21b58229d5da347b3bab44045430a33d5edb':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 19:20:30 +00:00
Junda Liu
9ddc014da2
am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit '88c4e40636e2d2022b7afdacccb4de0d07d7703f':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:20:10 +00:00
Chris Tate
df1fffe20d
am 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit '498cf7ac937fda7e766fe96547a71f129f4cccb0':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:18:21 +00:00
Quddus Chong
d87a21b582
am 433ecac9: am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit '433ecac90389abd3c5762232c3d6f7c0a4c3d03c':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 19:12:54 +00:00
Chris Tate
498cf7ac93
am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit 'a0d4c9758c3dc06b29c61a2f023599a83aea8268':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:11:40 +00:00
Junda Liu
88c4e40636
am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit '150123a37445dc778c30a466b6a69f575007c76d':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:11:24 +00:00
Andrew Solovay
a50c80c23e
am e03ca16d: am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
...
* commit 'e03ca16d1bf71ba453126bbd6d5ee8c5cb6a46e8':
docs: Updating the permissions docs for Preview 3.
2015-08-17 19:07:25 +00:00
Junda Liu
150123a374
am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
...
* commit 'f2cb6f7e3ea143ba4acace0821c9d49e363da7eb':
Grant SMS carrier provisioning app the permission to receive SMS.
2015-08-17 19:03:58 +00:00
Quddus Chong
433ecac903
am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit '101059b723ff03684fff89898bd5b046af320a16':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 19:03:51 +00:00
Chris Tate
a0d4c9758c
am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit '1a31af15c14ddc241e6e0633be337f81dea20ad5':
Check component permissions like 'exported' before assigned permissions
2015-08-17 19:01:52 +00:00
Junda Liu
f2cb6f7e3e
Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
2015-08-17 18:58:19 +00:00
Quddus Chong
101059b723
am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit 'aefae50d5e4d81601d52dce47e9be6e56834ccf3':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 18:56:40 +00:00
Chris Tate
1a31af15c1
am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
...
* commit 'a3fd27adcc655dd9566d72f290ac343704e8e4db':
Check component permissions like 'exported' before assigned permissions
2015-08-17 18:55:24 +00:00
Andrew Solovay
e03ca16d1b
am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
...
* commit '8552b77c6f68d67f7bf55d3f8c10039a8e9ca4fb':
docs: Updating the permissions docs for Preview 3.
2015-08-17 18:55:04 +00:00
Quddus Chong
aefae50d5e
am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
...
* commit 'a03567bfe0b2f71263e5facd0edc908bf43965cc':
docs: Fixed unclosed anchor tag for M Program Overview.
2015-08-17 18:47:52 +00:00
Xiyuan Xia
4d25a1d914
Merge "Add full screen user switcher to lock screen"
2015-08-17 18:47:38 +00:00
Alan Viverette
760a2d845a
Re-enable TAB traversal in ListView
...
This makes navigation asymmetrical, but that's preferable to navigation
straight-up not working at all.
Bug: 14392811
Change-Id: Ifbb41adabdc9e015c8ed7195cbfb92ec0d8458a0
2015-08-17 14:31:42 -04:00
Alan Viverette
1352a36bee
Separate TabWidget selection from keyboard focus
...
Also removes a bunch of weird accessibility hacks that shouldn't have
been there in the first place.
Bug: 19382871
Change-Id: I8cbdfb6e2dab98cc88028dff5bc23376c98a077a
2015-08-17 14:23:10 -04:00
Ruben Brunk
cbb6c16fe6
am 6f4f94ae: am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev
...
* commit '6f4f94ae60129be8052ae3b1c4fd9b83a4729073':
Add experimental camera session prepare API.
2015-08-17 18:01:20 +00:00