Adrian Roos
4bc08ab9a9
am 716f20d8: Merge "Define initial trust agent API"
...
* commit '716f20d833537461fef7d5d7ed62157451391f1c':
Define initial trust agent API
2014-03-31 19:14:29 +00:00
Adrian Roos
ff2144ccb4
Define initial trust agent API
...
Adds the minimal API needed to define a useful trust agent.
Bug: 13723878
Change-Id: Ib24440bab7b16d0b656bde8b059e7d42cab2c7dc
2014-03-31 20:40:49 +02:00
ztenghui
be23fa2f73
Make the reveal animation API public
...
Change-Id: Iafb17bc768b33b320ffa731a9474be05382126e6
2014-03-31 10:41:31 -07:00
Michael Wright
c7387a84d7
am 84ad5d88: am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit '84ad5d8891d3a6921b9cfd1329022840682d55e2':
Add InputDevice#supportsSource(int).
2014-03-29 01:15:08 +00:00
Michael Wright
84ad5d8891
am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit '5d7db503bd779fb712391174a2b12327a0f9ec51':
Add InputDevice#supportsSource(int).
2014-03-29 01:09:30 +00:00
Michael Wright
5d7db503bd
am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
Add InputDevice#supportsSource(int).
2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* changes:
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:56:00 +00:00
Selim Gurun
c05770025a
am b4f27c95: Merge "Support for new gTLDs"
...
* commit 'b4f27c95bcfd4ceb5ced42efcf20bcd2faa2b626':
Support for new gTLDs
2014-03-28 23:59:53 +00:00
Yuhao Zheng
562e755774
am 93627ac8: Merge "Wifi hotspot stack initial hook up"
...
* commit '93627ac86c3805aaf545501b586bbca4fbc259e9':
Wifi hotspot stack initial hook up
2014-03-28 23:59:46 +00:00
Alan Viverette
e848e74066
am e1e06ce8: Merge "Make Widget.Holo.Light.Button.Borderless style public"
...
* commit 'e1e06ce84bc3c71a9e1ebb4f55ea68c19d2b9dfb':
Make Widget.Holo.Light.Button.Borderless style public
2014-03-28 23:59:39 +00:00
Selim Gurun
b4f27c95bc
Merge "Support for new gTLDs"
2014-03-28 23:35:10 +00:00
Yuhao Zheng
93627ac86c
Merge "Wifi hotspot stack initial hook up"
2014-03-28 22:49:51 +00:00
Alan Viverette
e1e06ce84b
Merge "Make Widget.Holo.Light.Button.Borderless style public"
2014-03-28 22:22:22 +00:00
Alan Viverette
ec861f32bc
Make Widget.Holo.Light.Button.Borderless style public
...
Change-Id: I44c1e092fc886821561130ef9d57c2e11d195011
2014-03-28 15:20:49 -07:00
Dan Sandler
338f692f89
am 6c3051c4: Merge "Introduce CATEGORY_NOTIFICATION_PREFERENCES."
...
* commit '6c3051c4224e72e58e217d9080c9ce3599ff5740':
Introduce CATEGORY_NOTIFICATION_PREFERENCES.
2014-03-28 21:10:33 +00:00
Michael Wright
d08c864784
Add InputDevice#supportsSource(int).
...
This mirrors the InputEvent#isFromSource API.
Change-Id: Ie4869cc52d22d49a71d4d3e22f1ae38b16367395
2014-03-28 12:59:34 -07:00
John Spurlock
ec27a7caf3
am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api.
...
* commit '5579ec33eb317a19ad80929169b2b329b147d98b':
DO NOT MERGE Enhance the NotificationListenerService api.
2014-03-28 19:01:10 +00:00
Dan Sandler
6c3051c422
Merge "Introduce CATEGORY_NOTIFICATION_PREFERENCES."
2014-03-28 18:51:19 +00:00
John Spurlock
5579ec33eb
DO NOT MERGE Enhance the NotificationListenerService api.
...
Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void
Add to StatusBarNotification:
- getKey() : String
Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
2014-03-28 10:19:00 -04:00
John Spurlock
00f9f78010
am a4294297: Enhance the NotificationListenerService api.
...
* commit 'a4294297d46cc0b9f45897bc688c267502cce3ef':
Enhance the NotificationListenerService api.
2014-03-28 13:13:47 +00:00
John Spurlock
a4294297d4
Enhance the NotificationListenerService api.
...
Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void
Add to StatusBarNotification:
- getKey() : String
Bug:13562828
Change-Id: Idd9605dad8f942d68b4b32ab9625faf6c8642db9
2014-03-28 08:47:01 -04:00
Selim Gurun
b080c3c54a
Support for new gTLDs
...
Bug: 13006774
Add support for new generic Top-Level Domains (gTLDs) from ICANN
and deprecate the public APIs that depend on them. Due to the
fast profileration of gTLDs, it has become hard to keep this API
up-to-date. Further it already fails to recognize internal domains.
We thus replace them with simple "any letter sequence" regexps.
This CL is almost same as Ib6cb5360bbb4a02b14bb34acb30d1cc8ddec771b.
The difference is that the values of the public gTLD strings are only
deprecated and not modified.
Change-Id: I37c130ace9068b80eeaec3282a77450517ed7794
2014-03-27 16:56:54 -07:00
Matt Casey
198ab3cf6c
am ca04d718: Merge "Add a mediastore constant for playlists."
...
* commit 'ca04d7185369073ca0a291f37ec3680037711d44':
Add a mediastore constant for playlists.
2014-03-27 15:46:59 +00:00
Matt Casey
ca04d71853
Merge "Add a mediastore constant for playlists."
2014-03-27 15:43:19 +00:00
Dan Sandler
a55734aaed
Introduce CATEGORY_NOTIFICATION_PREFERENCES.
...
Allows applications to advertise to the system an Activity
where the user can configure the app's notifications. Will
be used by the Settings app.
Change-Id: Iafe7de79e20046d5655fda3f3a3cba9f5db059c4
2014-03-27 00:34:44 -04:00
Alan Viverette
4c55b96757
am a5df8067: Make quantum text styles public
...
* commit 'a5df8067ecf86feafa60ed88f38ae9bfdfa23975':
Make quantum text styles public
2014-03-27 01:46:14 +00:00
Alan Viverette
a5df8067ec
Make quantum text styles public
...
Change-Id: I6deab6eb712d0910cddf1e8daeddf4737d39ba58
2014-03-26 18:41:14 -07:00
Dianne Hackborn
d10451a5d8
am 27832b0e: Fix build.
...
* commit '27832b0e8878e2cc79518b4831cd51afe7ec7235':
Fix build.
2014-03-27 01:19:01 +00:00
Dianne Hackborn
27832b0e88
Fix build.
...
And prevent it from breaking again like this.
Change-Id: I68ca200714420ead41bdaa96fe320260ecddb426
2014-03-26 18:12:10 -07:00
Alan Viverette
698d82c5a6
am 2c5d6d74: Merge "Separate ripple animation logic, remove RevealDrawable"
...
* commit '2c5d6d742a35885820c33364fec65a7e163fbbf8':
Separate ripple animation logic, remove RevealDrawable
2014-03-27 00:37:59 +00:00
Alan Viverette
2c5d6d742a
Merge "Separate ripple animation logic, remove RevealDrawable"
2014-03-27 00:31:53 +00:00
John Hoford
8d9cc5e44a
am 49224acd: Merge "add Dynamic Drawable (vector graphics for Icons)"
...
* commit '49224acd789b2aae60bd0ec03cbf60cb9c712917':
add Dynamic Drawable (vector graphics for Icons)
2014-03-27 00:22:05 +00:00
John Hoford
49224acd78
Merge "add Dynamic Drawable (vector graphics for Icons)"
2014-03-27 00:14:14 +00:00
Matt Casey
1dbf1f81e2
Add a mediastore constant for playlists.
...
This is a followup to https://googleplex-android-review.git.corp.google.com/415218
I'm writing this change at the request of elmas@.
Bug: 13657009
Change-Id: I970cc59a33af2162c2488c4ddf628f7a73009cd6
2014-03-26 17:09:56 -07:00
John Hoford
abb7d134c0
add Dynamic Drawable (vector graphics for Icons)
...
Change-Id: Id44b7f6d1b8dd073b8ed35e2142a380550f2449b
2014-03-26 16:59:54 -07:00
Selim Gurun
1280f9285a
am 5632dc1c: Merge "Revert "Support for new gTLDs""
...
* commit '5632dc1cf0b4bded368dd53ab425e725f37dfeb8':
Revert "Support for new gTLDs"
2014-03-26 23:43:37 +00:00
Alan Viverette
47bf0d95ef
Separate ripple animation logic, remove RevealDrawable
...
Change-Id: I9d0370cea288e6caf518209b5bc94a66a0f9176f
2014-03-26 16:43:07 -07:00
Selim Gurun
f014f1569d
am 5579eb9b: Merge "Support for new gTLDs"
...
* commit '5579eb9b1664343804b24378a71fc38607284ac6':
Support for new gTLDs
2014-03-26 23:33:38 +00:00
Selim Gurun
5632dc1cf0
Merge "Revert "Support for new gTLDs""
2014-03-26 22:37:24 +00:00
Selim Gurun
a739994d60
Revert "Support for new gTLDs"
...
This reverts commit d3ff8bdf92c23d596f3e4701455223f9e3ac8873.
Change-Id: I2006c4fcca54a4bc3b680ea0b0600b359cac6ca3
2014-03-26 22:33:49 +00:00
Selim Gurun
5579eb9b16
Merge "Support for new gTLDs"
2014-03-26 21:42:52 +00:00
Michael Wright
1e3c93975e
Adds API for determining confirm and cancel keys.
...
Bug: 13624048
Change-Id: I9f42eeb9c3a6bdae35eb0d7213fb4ac0fd8dc0d9
2014-03-26 14:40:42 -07:00
Alan Viverette
79ebf68c67
am 460572b2: Merge "Fix attribute extraction, use color attrs in Quantum drawables"
...
* commit '460572b22fe8fe5880ad099090b38765e2f8a2f6':
Fix attribute extraction, use color attrs in Quantum drawables
2014-03-26 12:56:19 -07:00
Alan Viverette
1cd4612cc0
Fix attribute extraction, use color attrs in Quantum drawables
...
Removes some unused entries in the Quantum themes and styles and
collapses identical styles since we don't have separate drawables
anymore. Adds some Quantum text appearances as styles.
BUG: 12368046
Change-Id: I9334feb87391cd54ad3b77b297d135de436e1417
2014-03-26 12:33:48 -07:00
Yuhao Zheng
10bf6354a5
Wifi hotspot stack initial hook up
...
Add a dummy wifi hotspot service for futher development use. This is to
resolve the different between master branch and kwd branch, such that future
development can go into kwd and being auto-merged to master.
bug: 5485670
Change-Id: Ica58de445dd050a9f0b817f8e4accaa2478299c5
2014-03-25 15:00:45 -07:00
Zhijun He
993b9646d7
am aaad0047: Merge "Camera2: Add partial flash state"
...
* commit 'aaad0047a6c2e7478312b85ebab275a3578ec4c2':
Camera2: Add partial flash state
2014-03-25 13:58:57 -07:00
Zhijun He
8dda7273db
Camera2: Add partial flash state
...
Bug 13637334
Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
2014-03-25 13:49:30 -07:00
Alan Viverette
8922a0161f
am eebf17ad: Merge "Unhide touch feedback drawable and wrapper"
...
* commit 'eebf17ad202f712173840e25da356c5bef870ff8':
Unhide touch feedback drawable and wrapper
2014-03-24 19:59:53 -07:00