drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
185,346 Commits 1 Branch 0 Tags
Commit Graph

185346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
eef3bcbbe4 Merge "Replace usages of deprecated Resources.getColor() and getColorStateList()" 2015-03-19 01:54:09 +00:00
Alan Viverette
4a357cd2e5 Replace usages of deprecated Resources.getColor() and getColorStateList() 
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
 2015-03-18 18:37:18 -07:00
Chris Craik
f9eb4b90fe Merge "Use glops for text rendering" 2015-03-19 01:02:25 +00:00
Shawn Willden
29a5a5b654 am 1bed39a5: am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 
* commit '1bed39a5e4d57e4735e72a1e9765dcec62035b40':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
 2015-03-19 00:48:02 +00:00
Shawn Willden
98be580dbb am 615f39f9: am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 
* commit '615f39f911cdc4201b4e1c63c79ae1819a6645ea':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:47:54 +00:00
Shawn Willden
1bed39a5e4 am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 
* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
 2015-03-19 00:42:09 +00:00
Shawn Willden
615f39f911 am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 
* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:41:58 +00:00
Bryce Lee
d8379b907f am 8b8a0451: am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 
* commit '8b8a045133e0466e964b4094269585708805b90a':
  Add Assist global action for wear to different from VOICE_ASSIST
 2015-03-19 00:32:17 +00:00
Shawn Willden
e921b8a28f Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 2015-03-19 00:30:30 +00:00
Shawn Willden
e90774ddbc Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE. 
Also change to an ENUM, to match changes in keymaster_defs.h

Change-Id: Ieda3402563b0b9e4e8b100eb69a94651e51c6347
 2015-03-18 18:28:39 -06:00
Alan Viverette
4a4be5d93a Merge "Clean up ripple exit, null out software animators on cancel/end" 2015-03-19 00:27:45 +00:00
Shawn Willden
254c58c4e7 Merge changes Id9a22ad3,I629ab2c4 
* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:27:38 +00:00
Alan Viverette
fc8882f134 Clean up ripple exit, null out software animators on cancel/end 
Bug: 19682421
Change-Id: I40ff56ed98a6c67cd01c74e455899825013a1f12
 2015-03-18 17:26:54 -07:00
Bryce Lee
8b8a045133 am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 
* commit '8bc23e82af040334af4f2af1dae9898cc8c66df8':
  Add Assist global action for wear to different from VOICE_ASSIST
 2015-03-19 00:21:13 +00:00
Dongwon Kang
28299099db Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract" 2015-03-19 00:20:14 +00:00
Dongwon Kang
10c6e230bc Merge "TIF: Add TvInputInfo.isHardwareInput()." 2015-03-19 00:18:44 +00:00
Bryce Lee
8bc23e82af Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 2015-03-19 00:14:07 +00:00
Clara Bayarri
6820434edd Merge "Editor: Avoid the paste popup from coming up when a word is selected." 2015-03-19 00:04:37 +00:00
Nick Vaccaro
9504a9d90b am 23c7cef2: am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 
* commit '23c7cef2ca28bf3116611507457be953f45ca80b':
  Avoid unhandled page fault cases on Android Wear
 2015-03-19 00:01:15 +00:00
Mathieu Chartier
75f1ba5a81 am f792e016: am 437ac8f8: Merge "Add JIT late override property" 
* commit 'f792e01606b988ab84190217529cca53da8db3f5':
  Add JIT late override property
 2015-03-18 23:51:12 +00:00
Bart Sears
8b1c27c5ab am f5353e9d: am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev 
* commit 'f5353e9dda15fe49023083ec7ca2131feed7787d':
  Prevent activities from being started during setup wizard.
 2015-03-18 23:51:02 +00:00
Andreas Gampe
27f2fe5c1a am b078ff16: am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod" 
* commit 'b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6':
  Frameworks/base: Fix potential NPE in InputMethod
 2015-03-18 23:50:54 +00:00
Andreas Gampe
e09a941585 am 4f0a96d2: am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh" 
* commit '4f0a96d2d923bd1f4c7f46ec25c83711565b77db':
  Frameworks/base: Remove duplicate check in Mesh
 2015-03-18 23:50:47 +00:00
Andreas Gampe
870c4ba78a am 1eca7d66: am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor" 
* commit '1eca7d66ee3da87c622259544794b8fe998cdb92':
  Frameworks/base: Fix visibility flag in Editor
 2015-03-18 23:50:35 +00:00
Andreas Gampe
3c4ca688ce am 1dae2f93: am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script" 
* commit '1dae2f9341c05eee5d77489c579ffd621fbe108b':
  Frameworks/base: Fix potential NPE in Script
 2015-03-18 23:50:25 +00:00
Mark Salyzyn
2d5b2c7dc1 am 6a9cd7b0: am e2c8e504: Merge "logd: optimize statistics" 
* commit '6a9cd7b0d4215d9e20ed59e6ab0c328c81cd842b':
  logd: optimize statistics
 2015-03-18 23:49:08 +00:00
Jason Sams
68af9a9904 am b533f3e1: am 1aadd347: Merge "Avoid duplicate surface creation." 
* commit 'b533f3e1ad098b38070369609e6b1892828bc111':
  Avoid duplicate surface creation.
 2015-03-18 23:48:52 +00:00
Dan Sandler
61bc9d535b am b509a809: am fbd99e9f: am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 
* commit 'b509a809b20d1eae76613b43a93059c32c4a8435':
  Avoid crashing on corrupted notifications.
 2015-03-18 23:48:31 +00:00
Nick Vaccaro
23c7cef2ca am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 
* commit '74a0eb360da012c5a13577a8af33f6b28b0fadf7':
  Avoid unhandled page fault cases on Android Wear
 2015-03-18 23:44:20 +00:00
Nick Vaccaro
74a0eb360d Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 2015-03-18 23:37:52 +00:00
Wale Ogunwale
11b7445f95 Merge "Always position home stack either at the top or bottom of the list." 2015-03-18 23:17:56 +00:00
Wale Ogunwale
92acaf2074 Always position home stack either at the top or bottom of the list. 
The current implementation was okay since we mostly had
2 stacks (the home stack and 1 application stack), so moving the
application stack to the top meant the home stack was automatically
moved to the bottom. This is no longer the case if you have multiple
application stacks.

Change-Id: I8ec7cfdc3650a73a00c4e8dad869fb2bec2a4eac
 2015-03-18 16:11:51 -07:00
Chris Craik
e2bb380bc2 Use glops for text rendering 
Change-Id: I5e155c8baf3149f0ff231ec3c89dbff6bb8eae92
 2015-03-18 16:10:24 -07:00
Mathieu Chartier
f792e01606 am 437ac8f8: Merge "Add JIT late override property" 
* commit '437ac8f8445b078041171eff56ce7ffbd1cf6766':
  Add JIT late override property
 2015-03-18 23:09:21 +00:00
Clara Bayarri
6351e66014 Editor: Avoid the paste popup from coming up when a word is selected. 
The existing code already fires the selection action mode, which
contains all the elements from the popup.

This is the last case remaining in which the popup is used, so also
clean up all popup related code.

Change-Id: I68b8b7bc8076279371955265b0088bfa0c22760b
 2015-03-18 23:05:35 +00:00
Clara Bayarri
10ff56ec6d Merge "Editor: Make the Insertion handle start/finish the selection action mode on tap." 2015-03-18 23:02:58 +00:00
Mathieu Chartier
437ac8f844 Merge "Add JIT late override property" 2015-03-18 22:56:55 +00:00
Bart Sears
f5353e9dda am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev 
* commit '91281bbdde1d8bcec993ff61044a5aa4897f3175':
  Prevent activities from being started during setup wizard.
 2015-03-18 22:53:22 +00:00
Clara Bayarri
452fa75207 Editor: Make the Insertion handle start/finish the selection action mode on tap. 
The Insertion handle used to show/hide the paste popup, not that we are
unifying it with the selection action mode it should start/finish the mode.

There are no other use cases of the popup with the insertion handle, so that
code is cleaned up.

Change-Id: I40703bc8316f217edaf97aff72436935de60500c
 2015-03-18 22:41:39 +00:00
Andreas Gampe
b078ff16a3 am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod" 
* commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
  Frameworks/base: Fix potential NPE in InputMethod
 2015-03-18 22:33:28 +00:00
Rich Slogar
ac66a32611 am 42e0a631: am 1265575d: am 96693b29: am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '42e0a6316f21e1a461351500ebc6cd1801f8b52c':
  docs: downloads for sdk 24.1.2
 2015-03-18 22:33:20 +00:00
Andreas Gampe
4f0a96d2d9 am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh" 
* commit '9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e':
  Frameworks/base: Remove duplicate check in Mesh
 2015-03-18 22:33:16 +00:00
Geoff Mendal
0315435551 am 28c320c2: (-s ours) am b48d3ce0: (-s ours) am 54064f66: (-s ours) Import translations. DO NOT MERGE 
* commit '28c320c296ee3869f1677b95d571d9731dd0b96d':
  Import translations. DO NOT MERGE
 2015-03-18 22:33:13 +00:00
Andreas Gampe
1eca7d66ee am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor" 
* commit '2a247b361089c0744202b604e22f9a79d239b92c':
  Frameworks/base: Fix visibility flag in Editor
 2015-03-18 22:33:09 +00:00
Andreas Gampe
1dae2f9341 am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script" 
* commit '8df1bedcba5bf146c49ba6b6a89e4f97c018045c':
  Frameworks/base: Fix potential NPE in Script
 2015-03-18 22:33:01 +00:00
Tyler Gunn
d8cf85c249 Merge "resolved conflicts for merge of 00de38a1 to master" 2015-03-18 22:30:11 +00:00
Andreas Gampe
13dbc3d48d Merge "Frameworks/base: Fix potential NPE in InputMethod" 2015-03-18 22:19:58 +00:00
Andreas Gampe
9cc36ac2a2 Merge "Frameworks/base: Remove duplicate check in Mesh" 2015-03-18 22:19:27 +00:00
Andreas Gampe
2a247b3610 Merge "Frameworks/base: Fix visibility flag in Editor" 2015-03-18 22:19:08 +00:00
Mathieu Chartier
7a49028aa2 Add JIT late override property 
Required for JIT debug property since user builds can't restart
the shell.

Bug: 19735273

Change-Id: I1983852e80010c344b45e0bb459de47c56adfce8
 2015-03-18 15:18:52 -07:00